From 5ec4545456d2e599922fa8d11efe8f4e9a2435b2 Mon Sep 17 00:00:00 2001
From: krimpedance <krimpedance@gmail.com>
Date: Tue, 25 Oct 2016 20:29:20 +0900
Subject: [PATCH] Modified README.md

---
 README.md | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 91bb88f..e0c9332 100644
--- 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.\*