Merge remote-tracking branch 'origin/feat/leo-deploy' into feat/leo-deploy

# Conflicts:
#	Cargo.lock
#	leo/cli/commands/build.rs
#	leo/cli/commands/execute.rs
This commit is contained in:
evan-schott 2024-02-09 15:22:11 -08:00
commit 330ce0d87f
2 changed files with 262 additions and 244 deletions

503
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -150,6 +150,9 @@ version = "3.0.0"
#[dependencies.snarkos-cli]
#version = "2.2.4"
#[dependencies.snarkos-cli]
#version = "2.2.4"
[dependencies.snarkvm]
workspace = true
features = [ "circuit", "console" ]