resolved conflicts

CanzaApps · Mar 19, 2024 · 7064e7f · 7064e7f
2 parents 08a4455 + 86afdb0
commit 7064e7f
Show file tree

Hide file tree

Showing 29 changed files with 3,950 additions and 12,152 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.env b/.env
diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml
@@ -13,7 +13,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Run Slither
-      uses: crytic/slither-action@v0.2.0
+      uses: crytic/slither-action@v0.3.0
       id: slither
       with:
         node-version: 16

diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@ package-lock.json
 artifacts/
 cache/
 .openzeppelin/
+.env
+.DS_Store