From 8cfaca8a757baeca39ce1a4507c4418a76b2e8cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 17 Nov 2017 11:19:21 +0100
Subject: [PATCH] Fix overlooked rebasing error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 js/service/StatusService.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/js/service/StatusService.js b/js/service/StatusService.js
index c4ad30872..45ad9d7b7 100644
--- a/js/service/StatusService.js
+++ b/js/service/StatusService.js
@@ -47,12 +47,9 @@ app.factory('StatusService', function () {
 	};
 
 	StatusService.prototype.releaseWaiting = function () {
-		if (this.counter > 0)
-<<<<<<< HEAD
-		{this.counter--;}
-=======
+		if (this.counter > 0) {
 			this.counter--;
->>>>>>> Refactor boardlist loading process
+		}
 		if (this.counter <= 0) {
 			this.active = false;
 			this.counter = 0;