打包

build/asset-manifest.json

@@ -59,13 +59,8 @@
   "blessing-getPrize.js": "/mrstatic/js/blessing-getPrize.ae4e34e9.chunk.js",
   "blessing-getPrize.js.map": "/mrstatic/js/blessing-getPrize.ae4e34e9.chunk.js.map",
   "blessing-preheat.css": "/mrstatic/css/blessing-preheat.4d8e9342.chunk.css",
-<<<<<<< HEAD
-  "blessing-preheat.js": "/mrstatic/js/blessing-preheat.f010d335.chunk.js",
-  "blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.f010d335.chunk.js.map",
-=======
-  "blessing-preheat.js": "/mrstatic/js/blessing-preheat.a65422c6.chunk.js",
-  "blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.a65422c6.chunk.js.map",
->>>>>>> 11-11-formal
+  "blessing-preheat.js": "/mrstatic/js/blessing-preheat.7a35165b.chunk.js",
+  "blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.7a35165b.chunk.js.map",
   "blessing-rank.css": "/mrstatic/css/blessing-rank.4f55b203.chunk.css",
   "blessing-rank.js": "/mrstatic/js/blessing-rank.bee5d18f.chunk.js",
   "blessing-rank.js.map": "/mrstatic/js/blessing-rank.bee5d18f.chunk.js.map",
@@ -93,13 +88,8 @@
   "purchased.css": "/mrstatic/css/purchased.28c23daa.chunk.css",
   "purchased.js": "/mrstatic/js/purchased.2f92d794.chunk.js",
   "purchased.js.map": "/mrstatic/js/purchased.2f92d794.chunk.js.map",
-<<<<<<< HEAD
-  "runtime~main.js": "/mrstatic/js/runtime~main.f41ecf8e.js",
-  "runtime~main.js.map": "/mrstatic/js/runtime~main.f41ecf8e.js.map",
-=======
-  "runtime~main.js": "/mrstatic/js/runtime~main.9680697f.js",
-  "runtime~main.js.map": "/mrstatic/js/runtime~main.9680697f.js.map",
->>>>>>> 11-11-formal
+  "runtime~main.js": "/mrstatic/js/runtime~main.3815f6d7.js",
+  "runtime~main.js.map": "/mrstatic/js/runtime~main.3815f6d7.js.map",
   "search.css": "/mrstatic/css/search.85280180.chunk.css",
   "search.js": "/mrstatic/js/search.15481409.chunk.js",
   "search.js.map": "/mrstatic/js/search.15481409.chunk.js.map",
@@ -180,10 +170,6 @@
   "mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.e0655d4d.woff",
   "mrstatic/media/kanjia_cg_icon.png": "/mrstatic/media/kanjia_cg_icon.81a489ac.png",
   "mrstatic/media/video.scss": "/mrstatic/media/progress-share-bg.80011994.png",
-<<<<<<< HEAD
-  "precache-manifest.f30beec100c7eb9ad7fe7a17778711ff.js": "/precache-manifest.f30beec100c7eb9ad7fe7a17778711ff.js",
-=======
-  "precache-manifest.c222d40e07dac8272036fac74238b683.js": "/precache-manifest.c222d40e07dac8272036fac74238b683.js",
->>>>>>> 11-11-formal
+  "precache-manifest.d72f8e31a5bbbdb234ffb72883deec3a.js": "/precache-manifest.d72f8e31a5bbbdb234ffb72883deec3a.js",
   "service-worker.js": "/service-worker.js"
 }
\ No newline at end of file

build/precache-manifest.c222d40e07dac8272036fac74238b683.js → build/precache-manifest.d72f8e31a5bbbdb234ffb72883deec3a.js

@@ -16,16 +16,16 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/2.4d3b6bb4.chunk.js"
   },
   {
-    "revision": "c79abf5cb7ae8a82009cf68fe44d1078",
-    "url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
+    "revision": "6902434f8f18a23319d57d0ac8aaea8c",
+    "url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
   },
   {
     "revision": "bf7a21e7695f718ad637",
     "url": "/mrstatic/js/Activity.4ffe549d.chunk.js"
   },
   {
-    "revision": "6902434f8f18a23319d57d0ac8aaea8c",
-    "url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
+    "revision": "c79abf5cb7ae8a82009cf68fe44d1078",
+    "url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
   },
   {
     "revision": "c77f5187b093bf98d3c0",
@@ -156,13 +156,8 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/38.370e9886.chunk.js"
   },
   {
-<<<<<<< HEAD:build/precache-manifest.f30beec100c7eb9ad7fe7a17778711ff.js
-    "revision": "af5f027beeb9a4c40f17",
-    "url": "/mrstatic/js/blessing-preheat.f010d335.chunk.js"
-=======
-    "revision": "b64835e4dcaf2032bb82",
-    "url": "/mrstatic/js/blessing-preheat.a65422c6.chunk.js"
->>>>>>> 11-11-formal:build/precache-manifest.c222d40e07dac8272036fac74238b683.js
+    "revision": "5d20cec97136a798f087",
+    "url": "/mrstatic/js/blessing-preheat.7a35165b.chunk.js"
   },
   {
     "revision": "09b88e54a9cc39411d90",
@@ -221,13 +216,8 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/myorders.1749cfb1.chunk.js"
   },
   {
-<<<<<<< HEAD:build/precache-manifest.f30beec100c7eb9ad7fe7a17778711ff.js
-    "revision": "251342d9d7d761f7464e",
-    "url": "/mrstatic/js/runtime~main.f41ecf8e.js"
-=======
-    "revision": "15b24c64e4b32a4593b6",
-    "url": "/mrstatic/js/runtime~main.9680697f.js"
->>>>>>> 11-11-formal:build/precache-manifest.c222d40e07dac8272036fac74238b683.js
+    "revision": "6a3a909cbccc0d2f0bae",
+    "url": "/mrstatic/js/runtime~main.3815f6d7.js"
   },
   {
     "revision": "8e12fcb571d471b1be86",
@@ -298,11 +288,7 @@ self.__precacheManifest = [
     "url": "/mrstatic/css/38.2833f269.chunk.css"
   },
   {
-<<<<<<< HEAD:build/precache-manifest.f30beec100c7eb9ad7fe7a17778711ff.js
-    "revision": "af5f027beeb9a4c40f17",
-=======
-    "revision": "b64835e4dcaf2032bb82",
->>>>>>> 11-11-formal:build/precache-manifest.c222d40e07dac8272036fac74238b683.js
+    "revision": "5d20cec97136a798f087",
     "url": "/mrstatic/css/blessing-preheat.4d8e9342.chunk.css"
   },
   {
@@ -394,11 +380,7 @@ self.__precacheManifest = [
     "url": "/mrstatic/css/2.fd1b61f1.chunk.css"
   },
   {
-<<<<<<< HEAD:build/precache-manifest.f30beec100c7eb9ad7fe7a17778711ff.js
-    "revision": "0fc7eea60d0d4e01b0e06e8cbf7f10b5",
-=======
-    "revision": "18a6fbf2a9af497c5480150cacfce860",
->>>>>>> 11-11-formal:build/precache-manifest.c222d40e07dac8272036fac74238b683.js
+    "revision": "c8fad0c48b96ca15dc90752ac22f6846",
     "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.f30beec100c7eb9ad7fe7a17778711ff.js"
-=======
-  "/precache-manifest.c222d40e07dac8272036fac74238b683.js"
->>>>>>> 11-11-formal
+  "/precache-manifest.d72f8e31a5bbbdb234ffb72883deec3a.js"
 );
 
 workbox.clientsClaim();