gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rebase

Browse Source
This commit is contained in:
Michael Vines
2021-12-09 16:12:34 -08:00
parent 539ad4bea6
commit a31660815f
2 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Cargo.lock generated
View File

@ -5363,13 +5363,9 @@ dependencies = [
"console_error_panic_hook", "console_error_panic_hook",
"console_log", "console_log",
"curve25519-dalek 3.2.0", "curve25519-dalek 3.2.0",
<<<<<<< HEAD
"itertools 0.10.1",
=======
"getrandom 0.1.16", "getrandom 0.1.16",
"itertools 0.10.3", "itertools 0.10.1",
"js-sys", "js-sys",
>>>>>>> f4babb756 (Cargo.lock)
"lazy_static", "lazy_static",
"libsecp256k1 0.6.0", "libsecp256k1 0.6.0",
"log 0.4.14", "log 0.4.14",
@ -5654,14 +5650,9 @@ dependencies = [
"ed25519-dalek", "ed25519-dalek",
"ed25519-dalek-bip32", "ed25519-dalek-bip32",
"generic-array 0.14.4", "generic-array 0.14.4",
<<<<<<< HEAD
"hmac 0.11.0", "hmac 0.11.0",
"itertools 0.10.1", "itertools 0.10.1",
=======
"hmac 0.12.0",
"itertools 0.10.3",
"js-sys", "js-sys",
>>>>>>> f4babb756 (Cargo.lock)
"lazy_static", "lazy_static",
"libsecp256k1 0.6.0", "libsecp256k1 0.6.0",
"log 0.4.14", "log 0.4.14",

11
programs/bpf/Cargo.lock generated
View File

@ -3203,13 +3203,9 @@ dependencies = [
"console_error_panic_hook", "console_error_panic_hook",
"console_log", "console_log",
"curve25519-dalek 3.2.0", "curve25519-dalek 3.2.0",
<<<<<<< HEAD
"itertools 0.10.1",
=======
"getrandom 0.1.14", "getrandom 0.1.14",
"itertools 0.10.3", "itertools 0.10.1",
"js-sys", "js-sys",
>>>>>>> f4babb756 (Cargo.lock)
"lazy_static", "lazy_static",
"libsecp256k1 0.6.0", "libsecp256k1 0.6.0",
"log", "log",
@ -3364,14 +3360,9 @@ dependencies = [
"ed25519-dalek", "ed25519-dalek",
"ed25519-dalek-bip32", "ed25519-dalek-bip32",
"generic-array 0.14.4", "generic-array 0.14.4",
<<<<<<< HEAD
"hmac 0.11.0", "hmac 0.11.0",
"itertools 0.10.1", "itertools 0.10.1",
=======
"hmac 0.12.0",
"itertools 0.10.3",
"js-sys", "js-sys",
>>>>>>> f4babb756 (Cargo.lock)
"lazy_static", "lazy_static",
"libsecp256k1 0.6.0", "libsecp256k1 0.6.0",
"log", "log",