Resolved merge conflict again

Mohit Athwani · Mohit Athwani · commit 7ea3aad25717 · 2017-03-26T16:42:01.000-07:00
diff --git a/Foundation/NSString.swift b/Foundation/NSString.swift
@@ -1301,7 +1301,6 @@ extension NSString {
         let readResult = try NSData(contentsOf: url, options:[])
 
         let bytePtr = readResult.bytes.bindMemory(to: UInt8.self, capacity:readResult.length)
-
         if readResult.length >= 2 && bytePtr[0] == 254 && bytePtr[1] == 255 {
           enc?.pointee = String.Encoding.utf16BigEndian.rawValue
         }

Original file line number	Diff line number	Diff line change
`@@ -1301,7 +1301,6 @@ extension NSString {`
`1301`	`1301`	`let readResult = try NSData(contentsOf: url, options:[])`
`1302`	`1302`
`1303`	`1303`	`let bytePtr = readResult.bytes.bindMemory(to: UInt8.self, capacity:readResult.length)`
`1304`		`-`
`1305`	`1304`	`if readResult.length >= 2 && bytePtr[0] == 254 && bytePtr[1] == 255 {`
`1306`	`1305`	`enc?.pointee = String.Encoding.utf16BigEndian.rawValue`
`1307`	`1306`	`}`