Update TestNSURLSession.swift

swizzlr · web-flow · commit f41efc98b828 · 2017-03-14T10:40:13.000Z
diff --git a/TestFoundation/TestNSURLSession.swift b/TestFoundation/TestNSURLSession.swift
@@ -300,8 +300,6 @@ class TestURLSession : XCTestCase {
 
         XCTAssert(task.isEqual(task.copy()))
     }
-<<<<<<< HEAD
-=======
 
     func test_cancelTask() {
         let serverReady = ServerSemaphore()
@@ -375,7 +373,6 @@ class TestURLSession : XCTestCase {
 
         waitForExpectations(timeout: 30)
     }
->>>>>>> 413c913... test for 915
 }
 
 class SessionDelegate: NSObject, URLSessionDelegate {

Original file line number	Diff line number	Diff line change
`@@ -300,8 +300,6 @@ class TestURLSession : XCTestCase {`
`300`	`300`
`301`	`301`	`XCTAssert(task.isEqual(task.copy()))`
`302`	`302`	`}`
`303`		`-<<<<<<< HEAD`
`304`		`-=======`
`305`	`303`
`306`	`304`	`func test_cancelTask() {`
`307`	`305`	`let serverReady = ServerSemaphore()`
`@@ -375,7 +373,6 @@ class TestURLSession : XCTestCase {`
`375`	`373`
`376`	`374`	`waitForExpectations(timeout: 30)`
`377`	`375`	`}`
`378`		`->>>>>>> 413c913... test for 915`
`379`	`376`	`}`
`380`	`377`
`381`	`378`	`class SessionDelegate: NSObject, URLSessionDelegate {`