Merge 9a6ca47257 into 7fd1a60b01

2 months ago · e6749c78b3
2 changed files with 7 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -0,0 +1,6 @@
+Hello world 
+
+this change is made from the main branch'
+
+
+
--- a/conflict.txt
+++ b/conflict.txt
@ -0,0 +1 @@
+This file contains the resolved changes from both the FEATURE and MAIN branches.
				`@ -0,0 +1 @@`
				`This file contains the resolved changes from both the FEATURE and MAIN branches.`