Merge branch 'master' of github.com:morizotter/SwiftRefresher

morizotter · Dec 31, 2015 · f72d3d0 · f72d3d0
2 parents fbc6681 + 6790ee3
commit f72d3d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/...roj/project.xcworkspace/xcuserdata/moritanaoki.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/moritanaoki.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/README.md b/README.md
@@ -1,9 +1,13 @@
 # SwiftRefresher
 
+<<<<<<< HEAD
 [![Version](https://img.shields.io/cocoapods/v/SwiftRefresher.svg?style=flat)](http://cocoadocs.org/docsets/SwiftRefresher) [![License](https://img.shields.io/cocoapods/l/SwiftRefresher.svg?style=flat)](http://cocoadocs.org/docsets/SwiftRefresher) [![Platform](https://img.shields.io/cocoapods/p/SwiftRefresher.svg?style=flat)](http://cocoadocs.org/docsets/SwiftRefresher)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/morizotter/SwiftRefresher)
 
 `UIRefreshControl` on UIViewController's UITableView works strange. SwiftRefresher is on of the alternatives of UIRefreshControl.
+=======
+`UIRefreshControl` on UIViewController's UITableView works strange. SwiftRefresher is one of the alternatives of UIRefreshControl.
+>>>>>>> 6790ee3646c31b62e234d8449853c45eaae23e66
 
 ![refresher.gif](refresher.gif)