chore(rust): remove merge conflict marker

build-trust · Jan 4, 2024 · d6df002 · d6df002
1 parent 69593be
commit d6df002
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/implementations/rust/ockam/ockam_api/src/nodes/service.rs b/implementations/rust/ockam/ockam_api/src/nodes/service.rs
@@ -622,7 +622,6 @@ impl NodeManagerWorker {
             }
 
             // ==*== Services ==*==
-            //<<<<<<< HEAD
             (Post, ["node", "services", DefaultAddress::AUTHENTICATED_SERVICE]) => encode_response(
                 req,
                 self.start_authenticated_service(ctx, dec.decode()?).await,