Merge remote-tracking branch 'refs/remotes/origin/main'

2024-09-13 17:29:56 -05:00 · 2024-09-13 17:29:56 -05:00 · 7cc2e1a56a
commit 7cc2e1a56a
parent 5028a920ae f6f35aaa23
1 changed files with 4 additions and 1 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -4,7 +4,8 @@ version = "0.1.0"
 edition = "2021"

 [dependencies]
-clap = { version = "4.5.16", default-features = false, features = ["std", "color", "help", "usage", "derive", "cargo"] }
+<<<<<<< HEAD
+clap = { version = "4.5.17", default-features = false, features = ["std", "color", "help", "usage", "derive", "cargo"] }
 dirs = "5.0.1"

 [profile.dev]
@ -19,3 +20,5 @@ opt-level = "z"
 lto = true
 strip = true
 panic = "abort"
+=======
+>>>>>>> refs/remotes/origin/main