Skip to content

M
member
Commit 89044baa by Kyle_Li
Options

Merge branch 'feature/track.1.0.4' of http://115.159.76.241/gicmember/member into dev

parents 8920504e c79d9615
Showing with 5 additions and 1 deletions
dist/index.html
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./static/img/favicon.ico><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/lodash.min.js></script><title>memberproject</title><link href=./css/app.a786aa2c50e784898519e73c489315ff.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.40.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/people.2.0.42.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/store.2.0.00.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/selector.1.2.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/space.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.3.js></script><script type=text/javascript src=./js/manifest.2ad0e4f74298907ed6b4.js></script><script type=text/javascript src=./js/vendor.cd9850936d8912e8dbfb.js></script><script type=text/javascript src=./js/app.210f5d1f073ae553d05a.js></script></body></html>
=======
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./static/img/favicon.ico><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/lodash.min.js></script><title>memberproject</title><link href=./css/app.a786aa2c50e784898519e73c489315ff.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.40.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/people.2.0.42.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/store.2.0.00.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/selector.1.2.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/space.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./js/manifest.2ad0e4f74298907ed6b4.js></script><script type=text/javascript src=./js/vendor.cd9850936d8912e8dbfb.js></script><script type=text/javascript src=./js/app.210f5d1f073ae553d05a.js></script></body></html>
>>>>>>> c79d96153c62157324ba982f32bc1db60bedced4
index.html
......@@ -30,7 +30,7 @@
<script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/selector.1.2.13.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/space.2.0.02.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/track.1.0.3.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"></script>
</body>
</html>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment