1

1

dist/index.html

@@ -197,8 +197,13 @@
 
     })(window);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-beaf72a0.js"></script>
   <link rel="stylesheet" href="./assets/index-e55a9a7b.css">
+=======
+  <script type="module" crossorigin src="./assets/index-2d47a39b.js"></script>
+  <link rel="stylesheet" href="./assets/index-636b0edf.css">
+>>>>>>> online
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};if(location.protocol!="file:"){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>