chore: resolve conflicts

matter-labs · Nov 6, 2024 · 6e87603 · 6e87603
2 parents 0fac8e8 + 28bdb6c
commit 6e87603
Show file tree

Hide file tree

Showing 194 changed files with 8,344 additions and 2,528 deletions.
diff --git a/.github/workflows/nextest.yml b/.github/workflows/nextest.yml
@@ -67,12 +67,10 @@ jobs:
         with:
           bun-version: latest
       - name: Setup Python
-        if: contains(matrix.name, 'external')
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
       - name: Install Vyper
-        if: contains(matrix.name, 'external')
         run: pip install vyper~=0.4.0
 
       - name: Forge RPC cache