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