resolve conflict

CambioML · Oct 3, 2023 · 6a12dff · 6a12dff
1 parent c98fe79
commit 6a12dff
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 138 deletions.
diff --git a/...i/frontend/dist/assets/index-51debcf5.css → ...i/frontend/dist/assets/index-10f2d9f3.css b/...i/frontend/dist/assets/index-51debcf5.css → ...i/frontend/dist/assets/index-10f2d9f3.css
diff --git a/pykoi/frontend/dist/assets/index-42540648.js b/pykoi/frontend/dist/assets/index-42540648.js
diff --git a/pykoi/frontend/dist/assets/index-b2c98be3.js b/pykoi/frontend/dist/assets/index-b2c98be3.js
diff --git a/pykoi/frontend/dist/assets/index-c2d4a9bc.css b/pykoi/frontend/dist/assets/index-c2d4a9bc.css
diff --git a/pykoi/frontend/dist/assets/index-dc2068fd.js b/pykoi/frontend/dist/assets/index-dc2068fd.js
diff --git a/pykoi/frontend/dist/index.html b/pykoi/frontend/dist/index.html
@@ -5,8 +5,8 @@
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vite + Svelte</title>
-    <script type="module" crossorigin src="/assets/index-b2c98be3.js"></script>
-    <link rel="stylesheet" href="/assets/index-51debcf5.css">
+    <script type="module" crossorigin src="/assets/index-dc2068fd.js"></script>
+    <link rel="stylesheet" href="/assets/index-10f2d9f3.css">
   </head>
   <body>
     <div id="app"></div>