fix merge conflicts again

Layr-Labs · Jul 10, 2024 · 08b9418 · 08b9418
2 parents 829a687 + 3ecd01e
commit 08b9418
Show file tree

Hide file tree

Showing 12 changed files with 540 additions and 1,999 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -51,6 +51,9 @@ jobs:
     - name: Install dependencies
       run: sudo apt update && sudo apt install -y wabt
 
+    - name: Install dependencies
+      run: sudo apt update && sudo apt install -y wabt
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

diff --git a/.gitmodules b/.gitmodules
@@ -26,6 +26,9 @@
 [submodule "arbitrator/tools/wasmer"]
 	path = arbitrator/tools/wasmer
 	url = https://github.com/OffchainLabs/wasmer.git
+[submodule "nitro-testnode"]
+	path = nitro-testnode
+	url = https://github.com/OffchainLabs/nitro-testnode.git
 [submodule "arbitrator/langs/rust"]
 	path = arbitrator/langs/rust
 	url = https://github.com/OffchainLabs/stylus-sdk-rs.git