fix: wrongly resolved conflicts

JeneaVranceanu · JeneaVranceanu · commit a505a85d53be · 2022-08-11T13:04:03.000+03:00
diff --git a/Sources/web3swift/Utils/EIP/EIP681.swift b/Sources/web3swift/Utils/EIP/EIP681.swift
@@ -57,8 +57,6 @@ extension Web3 {
             self.isPayRequest = isPayRequest
             self.targetAddress = targetAddress
         }
-<<<<<<< HEAD
-=======
 
         public func makeEIP681Link(urlEncode: Bool = false) -> String? {
             let address: String
@@ -230,7 +228,6 @@ extension Web3 {
             default: return nil
             }
         }
->>>>>>> 35c85fd7... feat: encoding query parameters for EIP681 - except tuples, this is still a TODO
     }
 
     public struct EIP681CodeParser {

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,6 @@ extension Web3 {`
`57`	`57`	`self.isPayRequest = isPayRequest`
`58`	`58`	`self.targetAddress = targetAddress`
`59`	`59`	`}`
`60`		`-<<<<<<< HEAD`
`61`		`-=======`
`62`	`60`
`63`	`61`	`public func makeEIP681Link(urlEncode: Bool = false) -> String? {`
`64`	`62`	`let address: String`
`@@ -230,7 +228,6 @@ extension Web3 {`
`230`	`228`	`default: return nil`
`231`	`229`	`}`
`232`	`230`	`}`
`233`		`->>>>>>> 35c85fd7... feat: encoding query parameters for EIP681 - except tuples, this is still a TODO`
`234`	`231`	`}`
`235`	`232`
`236`	`233`	`public struct EIP681CodeParser {`