Fixed merge issues

marigold-dev · Nov 16, 2023 · 45f9edb · 45f9edb
1 parent a8e2ddd
commit 45f9edb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);