Add missing carriage return

vvenance · deronnax · commit b5ee6e5452b7 · 2020-02-04T19:47:39.000+01:00
diff --git a/TRANSLATORS b/TRANSLATORS
@@ -11,6 +11,9 @@ Jules Lasne
 Mathieu Dupuy
 Vivien Lambert
 Andy Kwok
+<<<<<<< HEAD
 Aya Keddam
 Antoine Wecxsteen 
+=======
+>>>>>>> deb02b0a... Add missing carriage return
 Valériane Venance
