fix conflict

The-Poolz · Dec 14, 2023 · 01c0223 · 01c0223
2 parents 818ec3f + 63f8ef7
commit 01c0223
Show file tree

Hide file tree

Showing 13 changed files with 4,334 additions and 8,628 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