fix conflicts

761f7fe4 · Detto Julien · 74b86d00 · 794e5c19 · 761f7fe4
Commit 761f7fe4 authored Nov 21, 2018 by Detto Julien
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

CONTRIBUTORS.md CONTRIBUTORS.md +3 -1

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

 * Marielle PASCALON, D69
 * Matthieu FAURE, Adullact (pour de vrai)
@@ -8,3 +8,5 @@
 * Tédé NGUYEN KHAC, CD69
 * Axel CASSULO, CD69
 * Julien DETTO, CD47
+* Michaël REHSPRINGER, CD47
+* Cédric MAIRAL, CD47