许成详 6 years ago
parent
commit
83a61fc10c
1 changed files with 1 additions and 4 deletions
  1. 1
    4
      dist/index.html

+ 1
- 4
dist/index.html View File

@@ -1,4 +1 @@
1
-<<<<<<< HEAD
2
-=======
3
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.cc1f90c9ffc52c3f483a949e2c10acd6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.7e921535e20f729cf046.js></script><script type=text/javascript src=./static/js/app.5c35c9c3aac1bbcf9f74.js></script></body></html>
4
->>>>>>> 0b9bbc49e3efad436d5b6723a315ca00d7060653
1
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.405261645c57f13b8405382c193ad660.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.005ee9522c4c4172eb04.js></script></body></html>