build

dist/colexiu.html

@@ -38,15 +38,9 @@
       },
     })
   </script>
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/colexiu-88ac721c.js"></script>
-  <link rel="modulepreload" crossorigin href="./assets/index-9b17f61c.js">
-  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-0e3acafe.js">
-=======
   <script type="module" crossorigin src="./assets/colexiu-7890d8c3.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-0351721b.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-e746a9e1.js">
->>>>>>> online
   <link rel="stylesheet" href="./assets/index-841ed6e1.css">
   <link rel="stylesheet" href="./assets/colexiu-4a62fa3a.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
@@ -58,13 +52,8 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-<<<<<<< HEAD
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-d88e9ab0.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-d1fc2011.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-755e6946.js"></script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-53c7004a.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-647ded5e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> online
 </body>
 
 </html>

dist/index.html

@@ -73,13 +73,8 @@
       }
     })
   </script>
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/index-55159d48.js"></script>
-  <link rel="modulepreload" crossorigin href="./assets/index-9b17f61c.js">
-=======
   <script type="module" crossorigin src="./assets/index-a8569114.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-0351721b.js">
->>>>>>> online
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-424cfb91.js">
   <link rel="stylesheet" href="./assets/index-841ed6e1.css">
   <link rel="stylesheet" href="./assets/plyr-ad8ef5ae.css">
@@ -97,13 +92,8 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-<<<<<<< HEAD
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-d88e9ab0.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-8a175521.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-755e6946.js"></script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-53c7004a.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-43839439.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> online
 </body>
 
 </html>

dist/orchestra.html

@@ -39,15 +39,9 @@
       transition: opacity .3s;
     }
   </style>
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/orchestra-5868bc59.js"></script>
-  <link rel="modulepreload" crossorigin href="./assets/index-9b17f61c.js">
-  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-0e3acafe.js">
-=======
-  <script type="module" crossorigin src="./assets/orchestra-6cb9f493.js"></script>
+  <script type="module" crossorigin src="./assets/orchestra-716ac4ef.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-0351721b.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-e746a9e1.js">
->>>>>>> online
   <link rel="stylesheet" href="./assets/index-841ed6e1.css">
   <link rel="stylesheet" href="./assets/orchestra-48fbf383.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
@@ -70,13 +64,8 @@
   </script>
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-<<<<<<< HEAD
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-d88e9ab0.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-7010dcc6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-755e6946.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-ae4563e7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> online
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-53c7004a.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-9921b07a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/report-share.html

@@ -23,13 +23,8 @@
       transition: opacity .3s;
     }
   </style>
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/report-share-c641e103.js"></script>
-  <link rel="modulepreload" crossorigin href="./assets/index-9b17f61c.js">
-=======
   <script type="module" crossorigin src="./assets/report-share-ebeedc13.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-0351721b.js">
->>>>>>> online
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-424cfb91.js">
   <link rel="stylesheet" href="./assets/index-841ed6e1.css">
   <link rel="stylesheet" href="./assets/plyr-ad8ef5ae.css">
@@ -54,13 +49,8 @@
   </script>
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-<<<<<<< HEAD
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-d88e9ab0.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-eef42502.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-755e6946.js"></script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-53c7004a.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-74d6b226.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> online
 </body>
 
 </html>