From 3d33ad7e8a63013bb5dd14b53f70d80252694f60 Mon Sep 17 00:00:00 2001 From: satyareddy Date: Sun, 14 Jan 2024 00:15:51 +0530 Subject: [PATCH 1/2] dev2 changes --- example1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example1.txt b/example1.txt index 234b870..227e061 100644 --- a/example1.txt +++ b/example1.txt @@ -1 +1 @@ -satya is a sports person +satya is a sports person and loyal person. From b7aa35a823e8ca46eac22b829e347fb3e793fec6 Mon Sep 17 00:00:00 2001 From: satyareddy Date: Sun, 14 Jan 2024 00:30:59 +0530 Subject: [PATCH 2/2] dev2 changes after conflict1 --- example1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/example1.txt b/example1.txt index 8150d8c..df6ead7 100644 --- a/example1.txt +++ b/example1.txt @@ -1,2 +1,3 @@ satya is a sports person and loyal person. satya is a sports person and good boy +for all \ No newline at end of file