From 45f9edb9200531141c704046f82a3c58b6da8464 Mon Sep 17 00:00:00 2001
From: Jason Ridgway-Taylor <jason@glottologist.co.uk>
Date: Thu, 16 Nov 2023 19:11:42 +0800
Subject: [PATCH] Fixed merge issues

---
 batcher-ui/src/utils/token-manager.ts | 2 +-
 batcher-ui/src/utils/utils.ts         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/batcher-ui/src/utils/token-manager.ts b/batcher-ui/src/utils/token-manager.ts
index af43da49..50822b08 100644
--- a/batcher-ui/src/utils/token-manager.ts
+++ b/batcher-ui/src/utils/token-manager.ts
@@ -34,7 +34,7 @@ export const getLexicographicalPairName = (
   from: string
 ): string => {
   const comp = to.localeCompare(from);
-  if (comp < 0)
+  if (comp < 0) {
     return `${to}-${from}`;
   } else {
     return `${from}-${to}`;
diff --git a/batcher-ui/src/utils/utils.ts b/batcher-ui/src/utils/utils.ts
index 08b7dad9..09379424 100644
--- a/batcher-ui/src/utils/utils.ts
+++ b/batcher-ui/src/utils/utils.ts
@@ -48,7 +48,7 @@ export const getSwaps = async () => {
     swaps.map((value, index) => [
       getLexicographicalPairName(value.swap.to, value.swap.from),
       value,
-    ])<<<<<<< 410-further-split-out-batcher-and-mm-contracts-to-avoid-size-constraint
+    ])
   );
   console.info('getSwaps swapMap', swapsMap);