fix

package.json

@@ -19,11 +19,8 @@
     "dayjs": "^1.10.7",
     "dexie": "^3.0.3",
     "enc-utils": "^3.0.0",
-<<<<<<< HEAD
     "node-sass": "^4.14.1",
-=======
     "js-base64": "^3.7.2",
->>>>>>> 762a8dc08e292898aa81bceb59b4638206d94f51
     "prepend-http": "^4.0.0",
     "quasar": "^2.0.4",
     "sass-loader": "^8.0.0",

public/index.html

@@ -18,7 +18,8 @@
   </noscript>
   <div id="app"></div>
   <!-- built files will be auto injected -->
-  <script src="//at.alicdn.com/t/font_2711356_k19r0hh1f4.js"></script>
+  <!-- <script src="//at.alicdn.com/t/font_2711356_k19r0hh1f4.js"></script> -->
+  <script src="//at.alicdn.com/t/font_2711356_53bl5jmwu2e.js"></script>
 </body>
 
 </html>
\ No newline at end of file