diff --git a/Cargo.lock b/Cargo.lock index 24ec352768..ca750ad535 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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", diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index c8ea667833..d602cd4965 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -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",