From a3c409704fd85d680aac97335cc633f5914e5d69 Mon Sep 17 00:00:00 2001 From: Sreekanth Manthena Date: Fri, 26 May 2023 10:11:52 -0400 Subject: [PATCH] Created new file --- testfile1 | 2 ++ testfile2 | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) create mode 100644 testfile1 delete mode 100644 testfile2 diff --git a/testfile1 b/testfile1 new file mode 100644 index 000000000..088ec935b --- /dev/null +++ b/testfile1 @@ -0,0 +1,2 @@ +This is line1, +This is line2 diff --git a/testfile2 b/testfile2 deleted file mode 100644 index d56080a96..000000000 --- a/testfile2 +++ /dev/null @@ -1,8 +0,0 @@ -<<<<<<< HEAD -<<<<<<< HEAD -This is line1. -This is line2. -======= ->>>>>>> parent of f5161cf... created test file -======= ->>>>>>> parent of f5161cf... created test file