correction conflit

# Conflicts: # CONTRIBUTORS.md

correction conflit
# Conflicts: # CONTRIBUTORS.md
c183a62e · Matthieu FAURE · 443c86f1 · 90e2936f · c183a62e
Commit c183a62e authored Jul 12, 2018 by Matthieu FAURE ⛵
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

CONTRIBUTORS.md CONTRIBUTORS.md +4 -1

No files found.
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
 # Contributros

+* Marielle PASCALON, D69
 * Matthieu FAURE, Adullact (pour de vrai)
 * Thomas Grimbert, SOPRA
-* Hubert BOCQUET, CD59
\ No newline at end of file
+* Hubert BOCQUET, CD59
+* Remi Baudchon, CD59
+* Tédé NGUYEN KHAC, CD69