From bc8c7d27c81bf896d7bde3e972bdab93313c9e79 Mon Sep 17 00:00:00 2001 From: Thomas Hunsaker Date: Mon, 18 Jul 2016 21:55:53 -0700 Subject: [PATCH] Missed conflict --- src/js/app.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/js/app.js b/src/js/app.js index b57b822..5b7f2f9 100644 --- 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;