From 462449984ff0044a5fed3fee636f15b2105e9801 Mon Sep 17 00:00:00 2001
From: Sreekanth Manthena <sr.manthena83@gmail.com>
Date: Fri, 26 May 2023 08:16:33 -0400
Subject: [PATCH] Revert "created my test file"

This reverts commit f5161cf7d03a33f29f14121962f7f57991b44337.

Conflicts:
	testfile2
---
 testfile2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/testfile2 b/testfile2
index 08ae3bb06..d56080a96 100644
--- a/testfile2
+++ b/testfile2
@@ -1,5 +1,8 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 This is line1.
 This is line2.
 =======
 >>>>>>> parent of f5161cf... created test file
+=======
+>>>>>>> parent of f5161cf... created test file