Added .testfile to test merge conflicts.
This commit is contained in:
parent
7ec16866d7
commit
d6fc266501
1 changed files with 1 additions and 0 deletions
1
.testfile
Normal file
1
.testfile
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Foo
|
||||||
Loading…
Add table
Add a link
Reference in a new issue