Fix merge conflict between master and refactor/k8sclient

2026-03-07 17:56:26 -05:00
2 changed files with 1150 additions and 1358 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,11 +16,9 @@ members = [
  "harmony_secret_derive",
  "harmony_secret",
  "adr/agent_discovery/mdns",
-  "brocade",
-  "harmony_agent",
-<<<<<<< HEAD
+   "brocade",
+   "harmony_agent",
   "harmony_agent/deploy", "harmony_node_readiness", "harmony-k8s",
->>>>>>> master
 ]

 [workspace.package]