Merge branch 'conflict-example' into erko-exam

ErisMik · Aug 31, 2023 · 54733b1 · 54733b1
2 parents 3161bd4 + 84bf984
commit 54733b1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/test.txt b/test.txt
@@ -1 +1 @@
-This is from the master branch
+This is from the OTHER branch