fix: ios test

trustwallet · Jul 14, 2023 · d73f179 · d73f179
1 parent c3fbeff
commit d73f179
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/swift/Tests/CoinAddressDerivationTests.swift b/swift/Tests/CoinAddressDerivationTests.swift
@@ -105,13 +105,10 @@ class CoinAddressDerivationTests: XCTestCase {
                      .klaytn,
                      .meter,
                      .okxchain,
-<<<<<<< HEAD
-                     .gatechain:
-=======
                      .confluxeSpace,
                      .opBNBtestnet,
-                     .acalaEVM:
->>>>>>> master
+                     .acalaEVM,
+                     .gatechain:
                     let expectedResult = "0x8f348F300873Fd5DA36950B2aC75a26584584feE"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
                 case .ronin: