Merge branch 'feature/russian-chars'

thunsaker · Jul 19, 2016 · 22ea97b · 22ea97b
2 parents 611a6b8 + bc8c7d2
commit 22ea97b
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/js/app.js b/src/js/app.js
@@ -22,13 +22,8 @@ var currentConfig = {};
 var littleMessages = false;
 
 var getCurrentConfig = function() {
-<<<<<<< HEAD
 	currentConfig.token =
 		localStorage.foursquare_token != null && localStorage.foursquare_token.length > 0 ?
-=======
-	currentConfig.token =
-		localStorage.foursquare_token != null && localStorage.foursquare_token.length > 0 ?
->>>>>>> master
 		"[TOKEN_NOT_SHOWN]" : "";
 	currentConfig.theme = parseInt(localStorage.spoon_theme);
 	currentConfig.unit = localStorage.spoon_unit;