Resolved merge conflict between master and conflict-feature

1 month ago · ca97b34907
1 changed files with 5 additions and 1 deletions
--- a/6
+++ b/6
@ -1,2 +1,6 @@
 Hello World!
-### Branch Feature - Added on conflict branch
+<<<<<<< HEAD
+### Branch Feature - Added on conflict branch
+=======
+### Master Branch Update - Conflicting Line
+>>>>>>> master