修改

8e0221e5 · zhengke · 42a04715 · 8e0221e5
Commit 8e0221e5 authored Jun 29, 2021 by zhengke
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

App.vue src/App.vue +0 -4

No files found.
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,11 +12,7 @@ export default {

 <style>
 @import url('~assets/css/font.css');
-<<<<<<< HEAD
 @import url('//at.alicdn.com/t/font_2077629_byb6agikplo.css');
-=======
-@import url('//at.alicdn.com/t/font_2077629_ogegjt0w5at.css');
->>>>>>> 7bea99e9854df27288c97b9448c94a6e43507a67

 html,
 body,