Merge branch 'conflict-a'

kahootali · Sep 12, 2023 · 137cf9a · 137cf9a
2 parents 5849ad2 + 92ae319
commit 137cf9a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/main-merge-ex.txt b/main-merge-ex.txt
@@ -2,5 +2,5 @@ Hello from main branch
 Hello from conflict branch
 
 
-
-Hello from main branch
+Hello from main branch
+Hello from conflict-a branch