From 73965dcaea350831a4bbfa59e3c73c88237615a8 Mon Sep 17 00:00:00 2001
From: wangxueliang <wangxueliang@yidian-inc.com>
Date: Sun, 1 Apr 2018 20:18:33 +0800
Subject: [PATCH] fix

---
 components/style.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/style.js b/components/style.js
index cf2abd2bd..c272e39ac 100644
--- 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