Merge branch 'master' of ssh://git.ablecorp.us:20/able/ableos

2022-04-11 15:34:52 -05:00 · 2022-04-11 15:34:52 -05:00 · 2e1ad746fe
parent 22cb0d71af 2b35e3054e
commit 2e1ad746fe
1 changed files with 4 additions and 0 deletions
--- a/repbuild/Cargo.toml
+++ b/repbuild/Cargo.toml
@ -5,6 +5,10 @@ edition = "2021"
 authors = ["Able", "NotAble"]

 [dependencies]
+<<<<<<< HEAD
+=======
+clap = { version = "3.1", features = ["cargo", "derive"] }
+>>>>>>> e6dbfb4a0a4e14c8bf2ead04bb2078627f5780eb
 xshell = "0.1.9"
 anyhow = "*"