merge

public/dashboard-staging/index.html

@@ -24,7 +24,7 @@
     content="The starting point for your next project with Minimal UI Kit, built on the newest version of Material-UI ©, ready to be customized to your style" />
   <meta name="keywords" content="react,material,kit,application,dashboard,admin,template" />
   <meta name="author" content="Minimal UI Kit" />
-  <script type="module" crossorigin src="/assets/index.29c4d558.js"></script>
+  <script type="module" crossorigin src="/assets/index.62c7ef0a.js"></script>
   <link rel="stylesheet" href="/assets/index.c91e36b5.css">
 <link rel="manifest" href="/manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="/registerSW.js"></script></head>
 

public/dashboard/index.html

@@ -24,7 +24,11 @@
     content="The starting point for your next project with Minimal UI Kit, built on the newest version of Material-UI ©, ready to be customized to your style" />
   <meta name="keywords" content="react,material,kit,application,dashboard,admin,template" />
   <meta name="author" content="Minimal UI Kit" />
+<<<<<<< HEAD
   <script type="module" crossorigin src="/assets/index.8da5f569.js"></script>
+=======
+  <script type="module" crossorigin src="/assets/index.37db8778.js"></script>
+>>>>>>> bb925503f0e6dc226a555070afd79dd92c81ec34
   <link rel="stylesheet" href="/assets/index.c91e36b5.css">
 <link rel="manifest" href="/manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="/registerSW.js"></script></head>