打包

build/precache-manifest.65fb87382f9a118921c818cbd07bba1c.js → build/precache-manifest.e7ab87631f7977a56a5a0f7bd8925cfd.js

@@ -220,16 +220,16 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/search.e7025d66.chunk.js"
   },
   {
-    "revision": "bf4b965723ccd49ab454",
-    "url": "/mrstatic/js/runtime~main.ec73e3de.js"
+    "revision": "8ae6db5f456602d50d61",
+    "url": "/mrstatic/js/runtime~main.25cb9767.js"
   },
   {
     "revision": "be35fb43b030d7908648",
     "url": "/mrstatic/js/myorders.a2e0875b.chunk.js"
   },
   {
-    "revision": "74b5bf5172f181659109",
-    "url": "/mrstatic/js/python-class.3507a1ea.chunk.js"
+    "revision": "ad78453fe4e96ae08231",
+    "url": "/mrstatic/js/python-class.cb26d635.chunk.js"
   },
   {
     "revision": "613ce10e3138f8c35dda",
@@ -260,7 +260,7 @@ self.__precacheManifest = [
     "url": "/mrstatic/css/purchased.28c23daa.chunk.css"
   },
   {
-    "revision": "74b5bf5172f181659109",
+    "revision": "ad78453fe4e96ae08231",
     "url": "/mrstatic/css/python-class.e21cd5e3.chunk.css"
   },
   {
@@ -432,7 +432,7 @@ self.__precacheManifest = [
     "url": "/mrstatic/css/1.cdac8b51.chunk.css"
   },
   {
-    "revision": "a05d5cc47831596b1530bf574f5fc3f8",
+    "revision": "0d527942c4e28ab41921fbe2cd0d3ed9",
     "url": "/index.html"
   }
 ];
\ No newline at end of file

build/service-worker.js

@@ -14,11 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
 
 importScripts(
-<<<<<<< HEAD
-  "/precache-manifest.65fb87382f9a118921c818cbd07bba1c.js"
-=======
-  "/precache-manifest.8af7408d111f1745db0f47aad273a9d8.js"
->>>>>>> 7020f977eaf2c58e79c61fa82df9984013be7e68
+  "/precache-manifest.e7ab87631f7977a56a5a0f7bd8925cfd.js"
 );
 
 workbox.clientsClaim();