Commit cddf92bd authored by Thomas Desmoulins's avatar Thomas Desmoulins

gestion des conflit sur contributors

parents 16b55166 5bdae473
......@@ -15,4 +15,6 @@
* Michael TROLLIER, CD06
* Thomas GRIMBER, SOPRA
* Sebsk8
* Thomas Desmoulins, CD33 , avec le bon mode op
\ No newline at end of file
* Thomas Desmoulins, CD33 , avec le bon mode op
* Sébastien MATRION (2), DEP33
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment