Update conflict file in main branch

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