hb

dist/index.html

@@ -37,11 +37,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-<<<<<<< HEAD
-    }</style><link href=./static/css/app.7a80cc3ed965af112bbc262c977e79ad.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.13ce8e475898fba4b86d.js></script><script type=text/javascript src=./static/js/vendor.715d92365c85ab803f65.js></script><script type=text/javascript src=./static/js/app.3138bdf0c4c48f8e2462.js></script></body></html><script>function stopSafari() {
-=======
     }</style><link href=./static/css/app.7c88cf1f261d3e6ee65da74e2bc004d4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.dfc8a8e3392292c7b8e5.js></script><script type=text/javascript src=./static/js/app.bd4b716e772186fbb130.js></script></body></html><script>function stopSafari() {
->>>>>>> beta
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {