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,

sonar-plugin/src/main/resources/org/greencodeinitiative/creedengo/profiles/javascript_profile.json

@@ -1,10 +1,7 @@
 {
   "name": "Creedengo",
   "ruleKeys": [
-<<<<<<< Updated upstream
-=======
     "GCI7",
->>>>>>> Stashed changes
     "GCI9",
     "GCI11",
     "GCI12",