Add conflict demonstration file

2 months ago · ba263a96dd
1 changed files with 2 additions and 0 deletions
--- a/conflict.txt
+++ b/conflict.txt
@ -0,0 +1,2 @@
 hello world 
 change made in main branch