dev #13442 test fix

library/Class/Systeme/ModulesMenu.php

@@ -129,7 +129,7 @@ class Class_Systeme_ModulesMenu extends Class_Systeme_ModulesAbstract {
                          "RESERVER_POSTE" => new Class_Systeme_ModulesMenu_ReserverPoste(),
                          'SUGGESTION_ACHAT' => new Class_Systeme_ModulesMenu_SuggestionAchat(),
                          'WEBKIOSK_RESERVATION' => new Class_Systeme_ModulesMenu_WebkioskReservation(),
-                         'CITE_DE_LA_MUSIQUE' => new Class_Systeme_ModulesMenu_CiteDeLaMusique()
+                         'CITE_DE_LA_MUSIQUE' => new Class_Systeme_ModulesMenu_CiteDeLaMusique(),
                          'ASSIMIL' => new Class_Systeme_ModulesMenu_Assimil(),
     ];
 

library/Class/TypeDoc.php

@@ -251,11 +251,8 @@ class Class_TypeDoc extends Storm_Model_Abstract {
             self::JAMENDO => 'Jamendo',
             self::WEBSITE => 'Site web',
             self::SOUNDCLOUD => 'SoundCloud',
-<<<<<<< HEAD
+            self::ASSIMIL => 'ASSIMIL e-méthode',
             self::CITEDELAMUSIQUE => 'Cite De La Musique'
-=======
-            self::ASSIMIL => 'ASSIMIL e-méthode'
->>>>>>> master
     ];
   }