fixup! AA: Remove Out-of-date API and crates which implemented by CDH

confidential-containers · Jan 16, 2024 · 940ac2a · 940ac2a
1 parent 6bb4f6e
commit 940ac2a
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/confidential-data-hub/image/Cargo.toml b/confidential-data-hub/image/Cargo.toml
@@ -10,11 +10,7 @@ edition = "2021"
 base64.workspace = true
 crypto.path = "../deps/crypto"
 kms = { path = "../kms", default-features = false }
-<<<<<<< HEAD
-resource_uri.path = "../../attestation-agent/deps/resource_uri"
-=======
-resource_uri = { path = "../deps/resource_uri", optional = true }
->>>>>>> 9d6651f (AA: Remove Out-of-date API and crates which implemented by CDH)
+resource_uri.path = "../deps/resource_uri"
 serde.workspace = true
 serde_json.workspace = true
 thiserror.workspace = true