Resolve merge conflicts

AleoNet · Jun 16, 2023 · 42af13b · 42af13b
2 parents 681e0aa + 5276b04
commit 42af13b
Show file tree

Hide file tree

Showing 105 changed files with 1,522 additions and 967 deletions.
diff --git a/.cargo/release-version b/.cargo/release-version
@@ -1 +1 @@
-v0.12.0
+v0.12.2
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -479,15 +479,6 @@ jobs:
           workspace_member: parameters
           cache_key: snarkvm-parameters-cache
 
-  r1cs:
-    docker:
-      - image: cimg/rust:1.69
-    resource_class: xlarge
-    steps:
-      - run_serial:
-          workspace_member: r1cs
-          cache_key: snarkvm-r1cs-cache
-
   synthesizer:
     docker:
       - image: cimg/rust:1.69
@@ -656,7 +647,6 @@ workflows:
       - fields
       - ledger
       - parameters
-      - r1cs
       - synthesizer
       - synthesizer-coinbase
       - synthesizer-snark
@@ -679,7 +669,6 @@ workflows:
                 curves,
                 fields,
                 parameters,
-                r1cs,
                 synthesizer,
                 utilities,
               ]