fix

2018-04-01 20:18:33 +08:00 · 2018-04-01 20:18:33 +08:00 · 76b5f231a8
parent a29b8288fb
commit 76b5f231a8
1 changed files with 0 additions and 3 deletions
--- a/components/style.js
+++ b/components/style.js
@ -34,8 +34,5 @@ import './steps/style'
 import './breadcrumb/style'
 import './calendar/style'
 import './date-picker/style'
-<<<<<<< HEAD
 import './slider/style'
-=======
 import './table/style'
->>>>>>> f1e62240e0d804ac03d8ca28616621f3c312f31f