diff --git a/file1.txt b/file1.txt index c805bbd..d028420 100644 --- a/file1.txt +++ b/file1.txt @@ -1,3 +1,11 @@ file 1 is added adding more code + +ghfjdt + +Love You!! + +learning how to create PR + +======= learning merge conflict diff --git a/file2.txt b/file2.txt index e49efc7..9e18aed 100644 --- a/file2.txt +++ b/file2.txt @@ -2,4 +2,10 @@ i am in branch1 trying merging branch +U are Bablu + +Suchi di's file +I am a change +Trying to make a change +======= Suchi di's file