Modified README.md

krimpedance · Oct 25, 2016 · 5ec4545 · 5ec4545
1 parent bb18315
commit 5ec4545
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/README.md b/README.md
@@ -15,20 +15,12 @@
 <img src="./Images/styles.png" height=300>
 
 ## Requirements
-<<<<<<< HEAD
-#### ver. 2.\* (current version)
-=======
-#### ver. 2.\*
->>>>>>> swift2.3
+#### ver. 2.\* (current branch)
 - iOS 9.0+
 - Xcode 8.0+
 - Swift 3.\*
 
-<<<<<<< HEAD
 #### ver. 1.\*(1.7.0 and over)
-=======
-#### ver. 1.\*(1.7.0 and over) (current branch)
->>>>>>> swift2.3
 - iOS 8.0+
 - Xcode 8.0+
 - Swift 2.3.\*