Skip to content
Snippets Groups Projects
Commit cc9ae2ea authored by Guille Polito's avatar Guille Polito
Browse files

trying to get a conflict

parent a99c0213
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
toto
+ 1
− 1
View file @ cc9ae2ea
Ceci est toto
\ No newline at end of file
Ceci est toto modifie depuis le premier depot
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment