Add forgotten meger conflict resolution

1 files changed, 0 insertions, 19 deletions

diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 2501ef24b..9cc29e286 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -786,27 +786,8 @@ export class ExchangeWrapper extends ContractWrapper {
             return this._exchangeContractIfExists;
         }
         const contractInstance = await this._instantiateContractIfExistsAsync((ExchangeArtifacts as any));
-<<<<<<< HEAD
         this._exchangeContractIfExists = contractInstance as ExchangeContract;
         return this._exchangeContractIfExists;
-=======
-        this._exchangeContractByAddress[exchangeContractAddress] = contractInstance as ExchangeContract;
-        return this._exchangeContractByAddress[exchangeContractAddress];
-    }
-    private _getExchangeArtifactsByAddressOrThrow(exchangeContractAddress: string): ContractArtifact {
-        const exchangeArtifacts = _.values<ContractArtifact>(ExchangeArtifactsByName);
-        for (const exchangeArtifact of exchangeArtifacts) {
-            const networkSpecificExchangeArtifactValues = _.values(exchangeArtifact.networks);
-            const exchangeAddressesInArtifact = _.map(
-                networkSpecificExchangeArtifactValues,
-                networkSpecificExchangeArtifact => networkSpecificExchangeArtifact.address,
-            );
-            if (_.includes(exchangeAddressesInArtifact, exchangeContractAddress)) {
-                return exchangeArtifact;
-            }
-        }
-        throw new Error(ZeroExError.ExchangeContractDoesNotExist);
->>>>>>> Use PascalCase names as string enum keys
     }
     private async _getZRXTokenAddressAsync(exchangeContractAddress: string): Promise<string> {
         const exchangeInstance = await this._getExchangeContractAsync();