From 14cd24ea47f6eb5291684c218e982460990e7d1f Mon Sep 17 00:00:00 2001
From: Megan <77161947+fluffypill0w@users.noreply.github.com>
Date: Thu, 2 Jun 2022 19:11:25 +0200
Subject: [PATCH] feat/add MeshSwap on Polygon [TKR-374] (#491)

* Added MeshSwap on Polygon

* Updated changelog
---
 .../asset-swapper/src/utils/market_operation_utils/orders.ts   | 3 +++
 1 file changed, 3 insertions(+)

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 52bfb2378f..def40197da 100644
--- a/packages/asset-swapper/src/utils/market_operation_utils/orders.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/orders.ts
@@ -208,8 +208,11 @@ 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);
     }