solve merge conflicst

paraswap · Sep 27, 2023 · 278f74b · 278f74b
2 parents cb93e89 + 4ab8fff
commit 278f74b
Show file tree

Hide file tree

Showing 102 changed files with 16,291 additions and 1,067 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "2.28.11",
+  "version": "2.36.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",