From 372fd06b8a38aac9949c5742ff5a1f24330472b3 Mon Sep 17 00:00:00 2001
From: Sreekanth Manthena <sr.manthena83@gmail.com>
Date: Fri, 26 May 2023 08:08:04 -0400
Subject: [PATCH] Revert "created the test file"

This reverts commit f5161cf7d03a33f29f14121962f7f57991b44337.

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

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