fix conflicts

The-Poolz · Dec 15, 2023 · f13a304 · f13a304
2 parents 94b72a6 + 63f8ef7
commit f13a304
Show file tree

Hide file tree

Showing 13 changed files with 4,481 additions and 8,334 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@ gas-report.txt
 typechain-types
 coverage
 coverage.json
-contracts
+contracts
+.env
diff --git a/TestSetup.ts b/TestSetup.ts