Skip to content

Commit

Permalink
add conflicting line in main branch
Browse files Browse the repository at this point in the history
kahootali committed Sep 12, 2023
1 parent c4a2878 commit 5849ad2
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions main-merge-ex.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
Hello from main branch
Hello from conflict branch



Hello from main branch

0 comments on commit 5849ad2

Please sign in to comment.