2 månader sedan · 3c2c61617c
--- a/static/assets/index-CDBlYFWf.js
+++ b/static/assets/index-CDBlYFWf.js
--- a/static/assets/index-CnBVCYFe.js
+++ b/static/assets/index-CnBVCYFe.js
--- a/static/assets/index-xpK5d-II.js
+++ b/static/assets/index-xpK5d-II.js
--- a/static/index.html
+++ b/static/index.html
@@ -23,13 +23,8 @@
 
				 
			
 
				     <!-- Splash screens for iOS -->
			
 
				     <link rel="apple-touch-startup-image" href="/img/android-chrome-512x512.png" />
			
 
				-<<<<<<< HEAD
			
 
				-    <script type="module" crossorigin src="/assets/index-CDBlYFWf.js"></script>
			
 
				+    <script type="module" crossorigin src="/assets/index-xpK5d-II.js"></script>
			
 
				     <link rel="stylesheet" crossorigin href="/assets/index-DfcIVNpM.css">
			
 
				-=======
			
 
				-    <script type="module" crossorigin src="/assets/index-CnBVCYFe.js"></script>
			
 
				-    <link rel="stylesheet" crossorigin href="/assets/index-BoLtXYT2.css">
			
 
				->>>>>>> 121b3d5 (  fix: remove incorrect ethernet badge on printer cards)
			
 
				   </head>
			
 
				   <body>
			
 
				     <div id="root"></div>