Update conflict file in feature branch

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