From 9a00931c3fb3d602e4c01e7ade63039b5628591e Mon Sep 17 00:00:00 2001
From: Magnus Grimstvedt Saltnes <magnussaltnes@gmail.com>
Date: Thu, 18 Jun 2020 22:48:36 +0200
Subject: [PATCH] Implements some linter recommendations for CI check.

---
 src/js/game/hud/parts/building_placer_logic.js | 7 ++-----
 src/js/profile/application_settings.js         | 8 +++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/js/game/hud/parts/building_placer_logic.js b/src/js/game/hud/parts/building_placer_logic.js
index a58d2b64..5a462f47 100644
--- a/src/js/game/hud/parts/building_placer_logic.js
+++ b/src/js/game/hud/parts/building_placer_logic.js
@@ -1,4 +1,3 @@
-
 import { Math_abs, Math_degrees, Math_round } from "../../../core/builtins";
 import { globalConfig } from "../../../core/config";
 import { gMetaBuildingRegistry } from "../../../core/global_registries";
@@ -61,8 +60,7 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart {
             }
             const id = this.currentMetaBuilding.get().getId();
             return this.preferredRotations[id] || this.currentBaseRotationGeneral;
-
-        }
+        };
 
         this.setBaseRotation = function (rotation) {
             const rotationByBuilding = this.root.app.settings.getAllSettings().rotationByBuilding;
@@ -72,8 +70,7 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart {
                 const id = this.currentMetaBuilding.get().getId();
                 this.preferredRotations[id] = rotation;
             }
-        }
-
+        };
 
         /**
          * Whether we are currently dragging
diff --git a/src/js/profile/application_settings.js b/src/js/profile/application_settings.js
index 0e03e902..92edf124 100644
--- a/src/js/profile/application_settings.js
+++ b/src/js/profile/application_settings.js
@@ -530,7 +530,6 @@ export class ApplicationSettings extends ReadWriteProxy {
         }
 
         if (data.version < 13) {
-<<<<<<< HEAD
             data.settings.compactBuildingInfo = false;
             data.version = 13;
         }
@@ -554,11 +553,10 @@ export class ApplicationSettings extends ReadWriteProxy {
         if (data.version < 17) {
             data.settings.enableColorBlindHelper = false;
             data.version = 17;
-=======
+        }
+        if(data.version < 18) {
             data.settings.rotationByBuilding = true;
-            data.version = 13;
-
->>>>>>> 655c356... Adds tracking for rotation per building type.
+            data.version = 18;
         }
 
         return ExplainedResult.good();