solve merge conflicts

paraswap · Oct 27, 2023 · 8febe66 · 8febe66
2 parents 1b6d046 + afd5dcb
commit 8febe66
Show file tree

Hide file tree

Showing 44 changed files with 4,457 additions and 187 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "2.37.5",
+  "version": "2.17.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

diff --git a/scripts/dex-integration.ts b/scripts/dex-integration.ts
@@ -116,7 +116,7 @@ function testIntegration(argv: IOptions) {
       process.env.NODE_ENV = 'test';
     }
 
-    require('../node_modules/jest-cli/build/cli').run(
+    require('../node_modules/jest-cli/build').run(
       `src\/dex\/${dexNameParam}\/.+\.test\.ts`,
     );
   }