rebase development

2022-06-03 13:16:39 -04:00
parent 32b0743517
commit ce82d3529c
1 changed files with 0 additions and 3 deletions
--- a/packages/asset-swapper/src/utils/market_operation_utils/orders.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/orders.ts
@@ -177,11 +177,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);
    }