ci/cd: instead of build docker image, build directly workspace

kszinhu · Feb 20, 2024 · 11c4031 · 11c4031
1 parent 6f8eacd
commit 11c4031
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/app/Cargo.toml b/app/Cargo.toml
@@ -44,4 +44,8 @@ once_cell = { workspace = true }
 
 # Potentially remove later
 nanoid = "0.4"
+<<<<<<< HEAD
 openssl = "*"
+=======
+openssl = { version = "*", features = ["vendored"] }
+>>>>>>> 84a7414 (ci/cd: instead of build docker image, build directly workspace)