Merge branch 'main' into simple-lock-break-farm-into-initial-tokens

multiversx · Feb 8, 2024 · 61970b2 · 61970b2
2 parents 1d02cac + ef574c1
commit 61970b2
Show file tree

Hide file tree

Showing 14 changed files with 3,367 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,10 +2,6 @@
 # will have compiled files and executables
 **/target/
 **/output/
-# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-Cargo.lock
-!**/wasm*/Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk