合并

dist/index.html

@@ -49,12 +49,7 @@
     
     <!-- <script type="module" src="/src/teacher/main.ts"></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 id="vite-legacy-polyfill" src="./assets/polyfills-legacy.639f6553.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.b6c3c286.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.c11ce770.js"></script>
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.643a6119.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.3ce9204f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> online
   </body>
 </html>

dist/teacher.html

@@ -48,12 +48,7 @@
     <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 id="vite-legacy-polyfill" src="./assets/polyfills-legacy.639f6553.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.0d7f2d88.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.c11ce770.js"></script>
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.643a6119.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.7b187684.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> online
   </body>
 </html>