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

toto

parents 8882b7ff 61c5822e
No related branches found
No related tags found
1 merge request!9pour créer un conflit de JC vers le canonic
Show whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
conflict
+ 2
− 0
View file @ e519514d
......@@ -2,3 +2,5 @@ to create
Des conflits, des conflits.
a
conflictSimon
c'est ma ligne (JC)
conflict
\ 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