From 0ad297eae79f4f7148eec9b1a53f1c4b9702e155 Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Fri, 3 Jul 2020 16:20:44 +0900 Subject: [PATCH] Fix some merge conflicts... --- programs/bpf/Cargo.lock | 4 ++-- programs/librapay/Cargo.lock | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index e7e05ac89e1c6f..ed15626a751c26 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -1666,8 +1666,8 @@ dependencies = [ "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "solana-config-program 1.3.0", @@ -1772,7 +1772,7 @@ dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-logger 1.3.0", "solana-metrics 1.3.0", "solana-sdk 1.3.0", "solana-sdk-macro-frozen-abi 1.3.0", diff --git a/programs/librapay/Cargo.lock b/programs/librapay/Cargo.lock index 98086cc6cde306..bce5558a34a509 100644 --- a/programs/librapay/Cargo.lock +++ b/programs/librapay/Cargo.lock @@ -2496,8 +2496,8 @@ dependencies = [ "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "solana-config-program 1.3.0", @@ -2602,6 +2602,7 @@ dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.112 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-logger 1.3.0", "solana-metrics 1.3.0", "solana-sdk 1.3.0", "solana-sdk-macro-frozen-abi 1.3.0",