ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix overlooked rebasing error

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2017-11-17 11:19:21 +01:00
committed by Julius Härtl
parent 03fc1fd0f2
commit 8cfaca8a75
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/service/StatusService.js
View File

@@ -47,12 +47,9 @@ app.factory('StatusService', function () {
}; };
StatusService.prototype.releaseWaiting = function () { StatusService.prototype.releaseWaiting = function () {
if (this.counter > 0) if (this.counter > 0) {
<<<<<<< HEAD
{this.counter--;}
=======
this.counter--; this.counter--;
>>>>>>> Refactor boardlist loading process }
if (this.counter <= 0) { if (this.counter <= 0) {
this.active = false; this.active = false;
this.counter = 0; this.counter = 0;