fix

Author: Mathis Girault

sonar-plugin/src/main/java/org/greencodeinitiative/creedengo/javascript/CheckList.java

@@ -37,10 +37,7 @@ public static List<Class<? extends JavaScriptCheck>> getAllChecks() {
                 AvoidAutoPlay.class,
                 AvoidBrightnessOverride.class,
                 AvoidCSSAnimations.class,
-<<<<<<< Updated upstream
-=======
                 AvoidGettersAndSetters.class,
->>>>>>> Stashed changes
                 AvoidHighAccuracyGeolocation.class,
                 AvoidKeepAwake.class,
                 LimitDbQueryResult.class,