Create a file to do conflict
This commit is contained in:
parent
34f1a3ca21
commit
8e60c04b2a
1 changed files with 2 additions and 0 deletions
2
fichier_conflit.txt
Normal file
2
fichier_conflit.txt
Normal file
|
@ -0,0 +1,2 @@
|
|||
test
|
||||
|
Loading…
Reference in a new issue