blob: 6e7448b95cbfad1de038b56bba2c5bbb159e20a6 (
plain)
1
2
3
4
5
6
7
8
9
10
|
diff --git a/ConflictOutOfBounds b/ConflictOutOfBounds
index 0000000..de98044
--- a/ConflictOutOfBounds
+++ b/ConflictOutOfBounds
@@ -25,4 +25,4 @@
line3
-lineA
+lineB
line5
line6
|