合并

源码
3 changed files with 7 additions and 1 deletions
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@ -1,2 +1,6 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>题库</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.19a89cf7.js></script><script src=/static/js/index.d6f00271.js></script></body></html>
+<<<<<<< HEAD
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b633b841.js></script><script src=/static/js/index.d4feb4d4.js></script></body></html>
+=======
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.19a89cf7.js></script><script src=/static/js/index.d6f00271.js></script></body></html>
+>>>>>>> 37729ebe057951f141ddd7011a2ae606b53ea608
--- a/unpackage/dist/build/web/static/js/index.d4feb4d4.js
+++ b/unpackage/dist/build/web/static/js/index.d4feb4d4.js
--- a/unpackage/dist/build/web/static/js/pages-user-index.919dc03c.js
+++ b/unpackage/dist/build/web/static/js/pages-user-index.919dc03c.js
Author	SHA1	Message	Date
syt	b97e720c61	合并	2 months ago
syt	f1aab9513e	源码	2 months ago