1

1

dev-dist/sw.js

@@ -79,7 +79,6 @@ define(['./workbox-ab7aa862'], function (workbox) {
    * requests for URLs in the manifest.
    * See https://goo.gl/S9QRab
    */
-<<<<<<< HEAD
   workbox.precacheAndRoute(
     [
       {
@@ -88,20 +87,11 @@ define(['./workbox-ab7aa862'], function (workbox) {
       },
       {
         url: 'index.html',
-        revision: '0.01fpdbnlohg'
+        revision: '0.dgsa3bi7t4g'
       }
     ],
     {}
   );
-=======
-  workbox.precacheAndRoute([{
-    "url": "registerSW.js",
-    "revision": "3ca0b8505b4bec776b69afdba2768812"
-  }, {
-    "url": "index.html",
-    "revision": "0.dgsa3bi7t4g"
-  }], {});
->>>>>>> e88ceec2bd9bc8a3c7563cf07df542962c2eb350
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(
     new workbox.NavigationRoute(workbox.createHandlerBoundToURL('index.html'), {