Commit 6ad6fec426cc9861372b77cf7797cfc8b96d6658
1 parent
4ca44fc272
Exists in
master
and in
1 other branch
merge conclict
Showing 1 changed file with 1 additions and 5 deletions Side-by-side Diff
scripts/SettingsController.js
View file @
6ad6fec
| ... | ... | @@ -29,7 +29,6 @@ |
| 29 | 29 | |
| 30 | 30 | console.log("gonna try to launch service worker now"); |
| 31 | 31 | if ('serviceWorker' in navigator) { |
| 32 | - navigator.serviceWorker.register('scripts/service-worker.js').then( | |
| 33 | 32 | |
| 34 | 33 | console.log('gonna try to launch service worker now'); |
| 35 | 34 | navigator.serviceWorker.register('scripts/service-worker.js').then( |
| ... | ... | @@ -57,7 +56,4 @@ |
| 57 | 56 | |
| 58 | 57 | |
| 59 | 58 | }); |
| 60 | -======= | |
| 61 | - }); | |
| 62 | ->>>>>>> 4331bd151446a1d95043bd61d557e08fbdd78ff5 |