From 68e0407e8f21a5adff66bbb57c09cb12ca9bb0c5 Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Sun, 22 Feb 2026 18:29:06 +0100 Subject: irmd: Fix bad merge in reg.c A merge conflict was left unresolved, resulting in compilation errors. Signed-off-by: Sander Vrijders Signed-off-by: Dimitri Staessens --- src/irmd/reg/reg.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/irmd/reg') diff --git a/src/irmd/reg/reg.c b/src/irmd/reg/reg.c index 9ee47221..0025f695 100644 --- a/src/irmd/reg/reg.c +++ b/src/irmd/reg/reg.c @@ -2008,11 +2008,7 @@ int reg_respond_accept(struct flow_info * info, info->n_pid = flow->info.n_pid; -<<<<<<< HEAD flow->req_data = *pbuf; -======= - reg_flow_set_data(flow, pbuf); ->>>>>>> c82f0de4 (irmd: Fix memleak in reg tests) clrbuf(*pbuf); if (reg_flow_update(flow, info) < 0) { -- cgit v1.2.3