Correction conflit v2

# Conflicts: # CONTRIBUTORS.md

Correction conflit v2
# Conflicts: # CONTRIBUTORS.md
e726715c · Axel CASSULO · c4efef0f · e035e9fb · e726715c
Commit e726715c authored Jul 12, 2018 by Axel CASSULO
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

CONTRIBUTORS.md CONTRIBUTORS.md +4 -0

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
+* Remi Baudchon, CD59
+* Tédé NGUYEN KHAC, CD69
 * Axel CASSULO, CD69
\ No newline at end of file