diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/irmd/reg/reg.c | 4 |
1 files changed, 0 insertions, 4 deletions
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) { |