Browse Source

update---hk

lsc 2 years ago
parent
commit
68f8af1156

+ 1 - 5
dist/index.html

@@ -18,11 +18,7 @@
       border-radius: 10px;
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
       background-color: rgba(0, 0, 0, 0.1);
-<<<<<<< HEAD
-    }</style><link href=./static/css/app.a9bd5bc4cc9830dcacb36c9285f24734.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.e272a0df0fb3ce5b6fea.js></script><script type=text/javascript src=./static/js/app.6a619d5622c0d7a8a6e6.js></script></body></html><script>function stopSafari() {
-=======
-    }</style><link href=./static/css/app.63e4018e847db7a006e355a6fabd8928.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.e81042531bab735dba9a.js></script><script type=text/javascript src=./static/js/app.f0d72c920368b14913ba.js></script></body></html><script>function stopSafari() {
->>>>>>> beta
+    }</style><link href=./static/css/app.e8b680ff01ab9dbaefa59bb4988d2512.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.e272a0df0fb3ce5b6fea.js></script><script type=text/javascript src=./static/js/app.a23342f5f04531047ced.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 1
dist/static/css/app.63e4018e847db7a006e355a6fabd8928.css


File diff suppressed because it is too large
+ 0 - 1
dist/static/css/app.a9bd5bc4cc9830dcacb36c9285f24734.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.a9bd5bc4cc9830dcacb36c9285f24734.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.e8b680ff01ab9dbaefa59bb4988d2512.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.e8b680ff01ab9dbaefa59bb4988d2512.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.6a619d5622c0d7a8a6e6.js


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/app.6a619d5622c0d7a8a6e6.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.a23342f5f04531047ced.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.a23342f5f04531047ced.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.f0d72c920368b14913ba.js


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/app.f0d72c920368b14913ba.js.map


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


Some files were not shown because too many files changed in this diff