build

dist/index.html

@@ -12,13 +12,8 @@
   <script src="./flexible.js"></script>
   <script src="./abc2svg/xml2abc.js"></script>
   <script src="./abc2svg/jquery-1.11.1.min.js"></script>
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/index-68e1dfdd.js"></script>
+  <script type="module" crossorigin src="./assets/index-b737e4f9.js"></script>
   <link rel="stylesheet" href="./assets/index-77c9ae65.css">
-=======
-  <script type="module" crossorigin src="./assets/index-28f8ccc1.js"></script>
-  <link rel="stylesheet" href="./assets/index-e829c357.css">
->>>>>>> 2023-8-31-上线
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
 </head>
@@ -27,13 +22,8 @@
   <div id="app"></div>
   
   <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-2011adef.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-1a72fd30.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-c2d8da09.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-3e0e791f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> 2023-8-31-上线
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-1d39e0cf.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>