From 6ad6fec426cc9861372b77cf7797cfc8b96d6658 Mon Sep 17 00:00:00 2001 From: CKW Date: Tue, 2 Jun 2015 08:22:13 -0700 Subject: [PATCH] merge conclict --- scripts/SettingsController.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/SettingsController.js b/scripts/SettingsController.js index 4d347e4..8394772 100644 --- a/scripts/SettingsController.js +++ b/scripts/SettingsController.js @@ -29,7 +29,6 @@ angular.module('flashy.SettingsController', ['ui.router']). console.log("gonna try to launch service worker now"); if ('serviceWorker' in navigator) { - navigator.serviceWorker.register('scripts/service-worker.js').then( console.log('gonna try to launch service worker now'); navigator.serviceWorker.register('scripts/service-worker.js').then( @@ -56,7 +55,4 @@ angular.module('flashy.SettingsController', ['ui.router']). } - }); -======= - }); ->>>>>>> 4331bd151446a1d95043bd61d557e08fbdd78ff5 + }); \ No newline at end of file -- 1.9.1