fix merge conflict

2025-07-02 11:26:27 -04:00
parent 7de9860dcf ee02906ce9
commit e857efa92f
19 changed files with 520 additions and 70 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1588,6 +1588,7 @@ dependencies = [
 "serde-value",
 "serde_json",
 "serde_yaml",
+ "similar",
 "temp-dir",
 "temp-file",
 "tokio",
@@ -4102,6 +4103,12 @@ dependencies = [
 "rand_core 0.6.4",
 ]

+[[package]]
+name = "similar"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
+
 [[package]]
 name = "simple_asn1"
 version = "0.6.3"