From 88bffb79e6e3b136664bf4fd67f66ed62ba2974f Mon Sep 17 00:00:00 2001
From: "Constantin P." <papizh.konstantin@demlabs.net>
Date: Fri, 13 Sep 2024 07:25:15 +0000
Subject: [PATCH] Hotfix 12923 5
---
modules/consensus/esbocs/dap_chain_cs_esbocs.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
index 51d8517732..c92bb23504 100644
--- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c
+++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
@@ -2732,11 +2732,7 @@ static void s_message_send(dap_chain_esbocs_session_t *a_session, uint8_t a_mess
l_args->message_size = l_message_size + l_sign_size;
memcpy(l_args->message, l_message, l_message_size + l_sign_size);
dap_proc_thread_callback_add(a_session->proc_thread, s_process_incoming_message, l_args);
-<<<<<<< HEAD
}
-=======
-\ }
->>>>>>> 1ba3c33fc3c96dd1deb6614419b50d8dc026126b
}
DAP_DELETE(l_message);
}
--
GitLab