Merge conflict file added locally

Makzy-creator · Jul 9, 2023 · 8373ca4 · 8373ca4
1 parent 087af6e
commit 8373ca4
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/merge-conflict.txt b/merge-conflict.txt
@@ -0,0 +1,5 @@
+Line 1 on github
+Line 2 on github
+Line three edited locally
+Line 4 on github
+Line 5 on github