Cargo.lock
(cherry picked from commit f4babb7566841efe2787997bfda371d90bdd55c3) # Conflicts: # Cargo.lock # programs/bpf/Cargo.lock
This commit is contained in:
parent
b0754cc575
commit
85f601993f
12
Cargo.lock
generated
12
Cargo.lock
generated
@ -5363,7 +5363,13 @@ dependencies = [
|
||||
"console_error_panic_hook",
|
||||
"console_log",
|
||||
"curve25519-dalek 3.2.0",
|
||||
<<<<<<< HEAD
|
||||
"itertools 0.10.1",
|
||||
=======
|
||||
"getrandom 0.1.16",
|
||||
"itertools 0.10.3",
|
||||
"js-sys",
|
||||
>>>>>>> f4babb756 (Cargo.lock)
|
||||
"lazy_static",
|
||||
"libsecp256k1 0.6.0",
|
||||
"log 0.4.14",
|
||||
@ -5648,8 +5654,14 @@ dependencies = [
|
||||
"ed25519-dalek",
|
||||
"ed25519-dalek-bip32",
|
||||
"generic-array 0.14.4",
|
||||
<<<<<<< HEAD
|
||||
"hmac 0.11.0",
|
||||
"itertools 0.10.1",
|
||||
=======
|
||||
"hmac 0.12.0",
|
||||
"itertools 0.10.3",
|
||||
"js-sys",
|
||||
>>>>>>> f4babb756 (Cargo.lock)
|
||||
"lazy_static",
|
||||
"libsecp256k1 0.6.0",
|
||||
"log 0.4.14",
|
||||
|
12
programs/bpf/Cargo.lock
generated
12
programs/bpf/Cargo.lock
generated
@ -3203,7 +3203,13 @@ dependencies = [
|
||||
"console_error_panic_hook",
|
||||
"console_log",
|
||||
"curve25519-dalek 3.2.0",
|
||||
<<<<<<< HEAD
|
||||
"itertools 0.10.1",
|
||||
=======
|
||||
"getrandom 0.1.14",
|
||||
"itertools 0.10.3",
|
||||
"js-sys",
|
||||
>>>>>>> f4babb756 (Cargo.lock)
|
||||
"lazy_static",
|
||||
"libsecp256k1 0.6.0",
|
||||
"log",
|
||||
@ -3358,8 +3364,14 @@ dependencies = [
|
||||
"ed25519-dalek",
|
||||
"ed25519-dalek-bip32",
|
||||
"generic-array 0.14.4",
|
||||
<<<<<<< HEAD
|
||||
"hmac 0.11.0",
|
||||
"itertools 0.10.1",
|
||||
=======
|
||||
"hmac 0.12.0",
|
||||
"itertools 0.10.3",
|
||||
"js-sys",
|
||||
>>>>>>> f4babb756 (Cargo.lock)
|
||||
"lazy_static",
|
||||
"libsecp256k1 0.6.0",
|
||||
"log",
|
||||
|
Loading…
x
Reference in New Issue
Block a user