From 8e38f1face454de4b2da10611de04ed169f24f18 Mon Sep 17 00:00:00 2001
From: karthikeyan1606 <59499478+karthikeyan1606@users.noreply.github.com>
Date: Sat, 4 Jan 2020 16:46:48 +0530
Subject: [PATCH] Update testfile

---
 testfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testfile b/testfile
index 3527fdf..bc5a7cd 100644
--- a/testfile
+++ b/testfile
@@ -1 +1 @@
-Hi , Devops sample test file... 
+testing merge conflicts