From 7158e7767f42a1fdf098bc24ac6872a1456f3dde Mon Sep 17 00:00:00 2001 From: Kantimahanty Rohit Date: Wed, 11 Jan 2023 16:36:08 +0530 Subject: [PATCH] changes to file1 in forked repo --- file1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/file1.txt b/file1.txt index c805bbd..942746e 100644 --- a/file1.txt +++ b/file1.txt @@ -1,3 +1,4 @@ file 1 is added adding more code learning merge conflict +Changing to file 1 in lab session