handle merge conflicts

succinctlabs · Aug 8, 2024 · 264ed2e · 264ed2e
1 parent d66664f
commit 264ed2e
Show file tree

Hide file tree

Showing 185 changed files with 4,307 additions and 1,535 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -227,4 +227,4 @@ jobs:
           cd ../script
           cargo remove sp1-sdk
           cargo add sp1-sdk --path $GITHUB_WORKSPACE/sdk
-          SP1_DEV=1 RUST_LOG=info cargo run --release
+          SP1_DEV=1 RUST_LOG=info cargo run --release -- --prove
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -24,12 +24,16 @@
         // // Examples.
         // "examples/chess/program/Cargo.toml",
         // "examples/chess/script/Cargo.toml",
+        // "examples/cycle-tracking/program/Cargo.toml",
+        // "examples/cycle-tracking/script/Cargo.toml",
         // "examples/fibonacci/program/Cargo.toml",
         // "examples/fibonacci/script/Cargo.toml",
         // "examples/io/program/Cargo.toml",
         // "examples/io/script/Cargo.toml",
         // "examples/json/program/Cargo.toml",
         // "examples/json/script/Cargo.toml",
+        // "examples/patch-testing/program/Cargo.toml",
+        // "examples/patch-testing/script/Cargo.toml",
         // "examples/regex/program/Cargo.toml",
         // "examples/regex/script/Cargo.toml",
         // "examples/rsa/program/Cargo.toml",