Create a file to do conflict

This commit is contained in:
Toto 2023-02-16 15:09:02 +01:00
parent 34f1a3ca21
commit 8e60c04b2a

2
fichier_conflit.txt Normal file
View file

@ -0,0 +1,2 @@
test