From f70341fb486604d879de99eafd43c1bd24c864a5 Mon Sep 17 00:00:00 2001 From: Noah Khamliche Date: Fri, 3 Jun 2022 13:16:39 -0400 Subject: [PATCH] rebase development --- .../asset-swapper/src/utils/market_operation_utils/orders.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/asset-swapper/src/utils/market_operation_utils/orders.ts b/packages/asset-swapper/src/utils/market_operation_utils/orders.ts index def40197da..52bfb2378f 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/orders.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/orders.ts @@ -208,11 +208,8 @@ export function getErc20BridgeSourceToBridgeSource(source: ERC20BridgeSource): s return encodeBridgeSourceId(BridgeProtocol.Platypus, 'Platypus'); case ERC20BridgeSource.MeshSwap: return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'MeshSwap'); -<<<<<<< HEAD case ERC20BridgeSource.BancorV3: return encodeBridgeSourceId(BridgeProtocol.BancorV3, 'BancorV3'); -======= ->>>>>>> 1f41fe6a2 (feat/add MeshSwap on Polygon [TKR-374] (#491)) default: throw new Error(AggregationError.NoBridgeForSource); }