cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Erik 2016-08-14 10:53:16 -04:00
parent b8d6c28ae4
commit d2cb8f2d9a
No known key found for this signature in database
GPG Key ID: 4930B7C5FBC1A69D
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -5,11 +5,7 @@ Socket.IO-client for iOS/OS X.
##Example ##Example
```swift ```swift
<<<<<<< HEAD let socket = SocketIOClient(socketURL: NSURL(string: "http://localhost:8080")!, config: [.log(true), .forcePolling(true)])
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
socket.on("connect") {data, ack in socket.on("connect") {data, ack in
print("socket connected") print("socket connected")