合并

dist/tenant.html

@@ -52,15 +52,9 @@
             _T_));
     })(Object);
   </script>
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/tenant.a66f70ff.js"></script>
+  <script type="module" crossorigin src="./assets/tenant.c1abae22.js"></script>
   <link rel="modulepreload" href="./assets/index.4f40e5e1.js">
   <link rel="modulepreload" href="./assets/auth.502d2fa7.js">
-=======
-  <script type="module" crossorigin src="./assets/tenant.1c2b8601.js"></script>
-  <link rel="modulepreload" href="./assets/index.65bb5fc0.js">
-  <link rel="modulepreload" href="./assets/auth.85fc1c66.js">
->>>>>>> iteration-20231226
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/tenant.d44cc3f0.css">
@@ -72,13 +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.c8e8477e.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.4868888f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.9d7739ea.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.50682f06.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> iteration-20231226
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.5062f6ac.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>