.

123a35f8 · zhangzhiwei · 06d98d06 · 123a35f8
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport><link rel=icon type=image/x-icon href=./static/favicon.ico><link rel=stylesheet href=//at.alicdn.com/t/font_1586872_yhll0m2jcs.css><title>E淘供货商</title><link href=/static/css/app.d3858f11ad6acdbd3db762a752c60cc1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.dfe496f31fffa2654a1c.js></script><script type=text/javascript src=/static/js/vendor.02a8d01969b52bb78b9a.js></script><script type=text/javascript src=/static/js/app.9c533f42bc14bb8986f3.js></script></body></html>
\ No newline at end of file
+<<<<<<< HEAD
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport><link rel=icon type=image/x-icon href=./static/favicon.ico><link rel=stylesheet href=//at.alicdn.com/t/font_1586872_yhll0m2jcs.css><title>E淘供货商</title><link href=/static/css/app.d3858f11ad6acdbd3db762a752c60cc1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.dfe496f31fffa2654a1c.js></script><script type=text/javascript src=/static/js/vendor.02a8d01969b52bb78b9a.js></script><script type=text/javascript src=/static/js/app.9c533f42bc14bb8986f3.js></script></body></html>
+=======
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport><link rel=icon type=image/x-icon href=./static/favicon.ico><link rel=stylesheet href=//at.alicdn.com/t/font_1586872_yhll0m2jcs.css><title>E淘供货商</title><link href=/static/css/app.d3858f11ad6acdbd3db762a752c60cc1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.dfe496f31fffa2654a1c.js></script><script type=text/javascript src=/static/js/vendor.02a8d01969b52bb78b9a.js></script><script type=text/javascript src=/static/js/app.dfcefe57a10ba583abd2.js></script></body></html>
+>>>>>>> release-pre