solve merge conflicts

ClayStack · Oct 18, 2023 · d63d579 · d63d579
2 parents 6418dd1 + 951cecd
commit d63d579
Show file tree

Hide file tree

Showing 96 changed files with 14,476 additions and 273 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "2.33.3",
+  "version": "2.40.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",