fix conflict

anza-xyz · Apr 20, 2024 · 66e33e7 · 66e33e7
1 parent abdb271
commit 66e33e7
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -280,7 +280,7 @@ rolling-file = "0.2.0"
 reqwest = { version = "0.11.20", default-features = false }
 rpassword = "7.2"
 rustc_version = "0.4"
-rustls = { version = "0.21.7", default-features = false, features = ["quic"] }
+rustls = { version = "0.21.11", default-features = false, features = ["quic"] }
 rustversion = "1.0.14"
 scopeguard = "1.2.0"
 semver = "1.0.19"

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock