From 6c553ab9a5c98348d00eec67a16221aed483bcb5 Mon Sep 17 00:00:00 2001 From: Sreekanth Manthena Date: Fri, 26 May 2023 10:24:39 -0400 Subject: [PATCH] reverted --- testfile2 | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 testfile2 diff --git a/testfile2 b/testfile2 new file mode 100644 index 000000000..d56080a96 --- /dev/null +++ b/testfile2 @@ -0,0 +1,8 @@ +<<<<<<< HEAD +<<<<<<< HEAD +This is line1. +This is line2. +======= +>>>>>>> parent of f5161cf... created test file +======= +>>>>>>> parent of f5161cf... created test file