Add files via upload

modify img info
2018-08-23 20:07:32 +08:00
1 parent 4483ea5b78
commit e077e1eb6c
@@ -1,27 +1,23 @@
-# 欢迎使用 HandyControl
-
-让我们开门见山，HandyControl已经开源的控件截图有：
-
-### 1、颜色拾取器ColorPicker
-
-![颜色拾取器ColorPicker](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/ColorPicker.gif)
-
-### 2、加载条Loading
-
-![加载条Loading](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Loading.gif)
-
-### 3、轮播Carousel
-
-![轮播Carousel](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Carousel.gif)
-
-### 4、页码条Pagination
-
-![轮播Pagination](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Pagination.gif)
-
-### 5、展开折叠框Expander
-
-<<<<<<< HEAD
-![展开折叠框Expander](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Expander.gif)
-=======
-![轮播Pagination](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Expander.gif)
->>>>>>> 7ade3a41fb7e04ed1e84113bd3ae69a9414e31c2
+# 欢迎使用 HandyControl
+
+让我们开门见山，HandyControl已经开源的控件截图有：
+
+### 1、颜色拾取器ColorPicker
+
+![颜色拾取器ColorPicker](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/ColorPicker.gif)
+
+### 2、加载条Loading
+
+![加载条Loading](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Loading.gif)
+
+### 3、轮播Carousel
+
+![轮播Carousel](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Carousel.gif)
+
+### 4、页码条Pagination
+
+![轮播Pagination](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Pagination.gif)
+
+### 5、展开折叠框Expander
+
+![展开折叠框Expander](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Expander.gif)