chore: resolved merge conflicts

shubhexists · Sep 5, 2024 · 9ac6609 · 9ac6609
2 parents 994eaa7 + 6ee4c3e
commit 9ac6609
Show file tree

Hide file tree

Showing 16 changed files with 787 additions and 129 deletions.
diff --git a/core/Cargo.lock b/core/Cargo.lock
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -10,10 +10,14 @@ categories = ["development-tools", "command-line-utilities", "parsing", "os", "h
 keywords = ["https", "certificates", "localhost", "local-development", "root-ca"]
 readme = "README.md"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 openssl = "0.10"
 clap = { version = "4.4.8", features = ["derive"] }
 dirs = "5.0"
-lazy_static = "1.4"
+sha2 = "0.10"
+lazy_static = "1.4"
+colored = "2.0"
+base64 = "0.21"
+
+[dev-dependencies]
+tempfile = "3.3"