From a086a7779b6f8c2947f6d5ef8908efed3e1cefe6 Mon Sep 17 00:00:00 2001
From: Jakob Haag <jakob.haag@gmx.de>
Date: Mon, 1 Jun 2020 20:34:44 +0200
Subject: [PATCH] fix rebase issues

---
 GoldWars/GoldWars/RoundCalculatorService.swift | 4 ++--
 GoldWars/GoldWars/RoundTimer.swift             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/GoldWars/GoldWars/RoundCalculatorService.swift b/GoldWars/GoldWars/RoundCalculatorService.swift
index 7372c9e..3fb1688 100644
--- a/GoldWars/GoldWars/RoundCalculatorService.swift
+++ b/GoldWars/GoldWars/RoundCalculatorService.swift
@@ -201,9 +201,9 @@ class RoundCalculatorService {
     
     func increaseMoveCounter(ownBase: Bool!) {
         if ownBase {
-            self.numberOfOwnUnitMoves = self.numberOfOwnUnitMoves + 1
+            self.numberOfOwnUnitMoves += 1
         } else {
-            self.numberOfAttacks = self.numberOfAttacks + 1
+            self.numberOfAttacks +=  1
         }
     }
 }
diff --git a/GoldWars/GoldWars/RoundTimer.swift b/GoldWars/GoldWars/RoundTimer.swift
index 2faa03a..34c5d3d 100644
--- a/GoldWars/GoldWars/RoundTimer.swift
+++ b/GoldWars/GoldWars/RoundTimer.swift
@@ -31,7 +31,7 @@ class RoundTimer: Timer {
     
     @objc func onTimerFires()
     {
-        timeLeft = timeLeft - 1
+        timeLeft -= 1
         
         EntityManager.gameEMInstance.updateTime(time: (timeLeft > 0 ? String(timeLeft) : roundEnded))