"BACKPORT-CONFLICT"

korthout · May 10, 2024 · bf1479b · bf1479b
1 parent 14b42c2
commit bf1479b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/conflict b/conflict
@@ -1 +1,5 @@
+<<<<<<< HEAD
 conflict
+=======
+This will conflict
+>>>>>>> 3457521 (Add a change that will conflict)