From 74fca870c998a96d344d83de526b035d2f3c6a29 Mon Sep 17 00:00:00 2001 From: Thomas Hunsaker Date: Mon, 18 Jul 2016 22:02:38 -0700 Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=20Build=20latest=20for=20release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/app.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/js/app.js b/src/js/app.js index 5b7f2f9..0f6bdea 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -362,11 +362,7 @@ function attemptCheckin(id, name, broadcast) { if(currentConfig.timeline === 1) { var pin = createPin(checkin.id,venue.name,venue.location.address); // console.log('Inserting pin now: ' + JSON.stringify(pin)); -<<<<<<< HEAD timeline.insertUserPin(pin, function(responseText) { -======= - timeline.insertUserPin(pin, function(responseText) { ->>>>>>> master // console.log('User Pin Result: ' + responseText); }); }