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

fix conflicgt with olivier

parents 9e4d9585 4b8f956e
No related branches found
No related tags found
1 merge request!7Modification du fichier conflict
......@@ -3,3 +3,4 @@ Des conflits, des conflits.
a
conflict
Des conflits ici aussi.
Olivier
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment