合并

dist/index.html

@@ -67,13 +67,8 @@
   
   <!-- <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.e2059479.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.4049d960.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f80d84d0.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.d131b7b3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> iteration-20240513-text
 </body>
 
 </html>

dist/teacher.html

@@ -52,7 +52,7 @@
             _T_));
     })(Object);
   </script>
-  <script type="module" crossorigin src="./assets/teacher.817f27be.js"></script>
+  <script type="module" crossorigin src="./assets/teacher.dbb65359.js"></script>
   <link rel="modulepreload" href="./assets/index.3bfa6a0e.js">
   <link rel="modulepreload" href="./assets/routes-common.fec36607.js">
   <link rel="stylesheet" href="./assets/index.d06f6378.css">
@@ -64,13 +64,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 id="vite-legacy-polyfill" src="./assets/polyfills-legacy.e2059479.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.054ab264.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f80d84d0.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.7a635d84.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> iteration-20240513-text
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.2bc9195d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/tenant.html

@@ -52,7 +52,7 @@
             _T_));
     })(Object);
   </script>
-  <script type="module" crossorigin src="./assets/tenant.fe2581ef.js"></script>
+  <script type="module" crossorigin src="./assets/tenant.e810aa7e.js"></script>
   <link rel="modulepreload" href="./assets/index.3bfa6a0e.js">
   <link rel="modulepreload" href="./assets/auth.37c81a49.js">
   <link rel="stylesheet" href="./assets/index.d06f6378.css">
@@ -66,12 +66,8 @@
   
   <!-- <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.e2059479.js"></script>
-=======
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f80d84d0.js"></script>
->>>>>>> iteration-20240513-text
-  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.8509217a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.5d0e4f55.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>