From d2cb8f2d9a5444d10d1d4e57e6055f40ae033ec7 Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Sun, 14 Aug 2016 10:53:16 -0400
Subject: [PATCH] fix conflict

---
 README.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/README.md b/README.md
index e5bfa51..5f375e9 100644
--- a/README.md
+++ b/README.md
@@ -5,11 +5,7 @@ Socket.IO-client for iOS/OS X.
 
 ##Example
 ```swift
-<<<<<<< HEAD
-let socket = SocketIOClient(socketURL: NSURL(string: "http://localhost:8080")!, options: [.log(true), .forcePolling(true)])
-=======
-let socket = SocketIOClient(socketURL: NSURL(string: "http://localhost:8080")!, config: [.Log(true), .ForcePolling(true)])
->>>>>>> development
+let socket = SocketIOClient(socketURL: NSURL(string: "http://localhost:8080")!, config: [.log(true), .forcePolling(true)])
 
 socket.on("connect") {data, ack in
     print("socket connected")