From d6df002124678485e628a1e6dc5aa11bcdaaf140 Mon Sep 17 00:00:00 2001
From: Oleksandr Deundiak <olek@ockam.io>
Date: Thu, 4 Jan 2024 13:11:48 +0400
Subject: [PATCH] chore(rust): remove merge conflict marker

---
 implementations/rust/ockam/ockam_api/src/nodes/service.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/implementations/rust/ockam/ockam_api/src/nodes/service.rs b/implementations/rust/ockam/ockam_api/src/nodes/service.rs
index 8439c176e3a..aa7c60b1941 100644
--- 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,