Resolve merge conflict between feature and main

2 months ago · 9a6ca47257
1 changed files with 1 additions and 2 deletions
--- a/conflict.txt
+++ b/conflict.txt
@ -1,2 +1 @@
-hello world 
+This file contains the resolved changes from both the FEATURE and MAIN branches.
 change made in feature branch branch
`@ -1,2 +1 @@`
	`hello world`	`This file contains the resolved changes from both the FEATURE and MAIN branches.`
	`change made in feature branch branch`