diff --git a/README.md b/README.md index 18ed2ea5..11db0ce1 100644 --- a/README.md +++ b/README.md @@ -20,4 +20,8 @@ ### 5、展开折叠框Expander -![展开折叠框Expander](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Expander.gif) \ No newline at end of file +<<<<<<< HEAD +![展开折叠框Expander](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Expander.gif) +======= +![轮播Pagination](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Expander.gif) +>>>>>>> 7ade3a41fb7e04ed1e84113bd3ae69a9414e31c2