Skip to content

Commit 28bd74d

Browse files
committed
adding bar
1 parent 347429b commit 28bd74d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

bar.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
rab
1+
bar
22

33
I'm trying to create a merge conflict with sapling.
4+
I've added this after the fact too.

0 commit comments

Comments
 (0)