diff options
| author | Sander Vrijders <sander@ouroboros.rocks> | 2026-02-22 18:29:06 +0100 |
|---|---|---|
| committer | Dimitri Staessens <dimitri@ouroboros.rocks> | 2026-02-22 18:33:20 +0100 |
| commit | 68e0407e8f21a5adff66bbb57c09cb12ca9bb0c5 (patch) | |
| tree | 03d1d629dd3c45a62a187d310d0964feb4dd04c7 /src/irmd/reg/reg.c | |
| parent | 5d930fed0cff09d7fc22c2b1152506c334a08f7a (diff) | |
| download | ouroboros-testing.tar.gz ouroboros-testing.zip | |
A merge conflict was left unresolved, resulting in compilation errors.
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Diffstat (limited to 'src/irmd/reg/reg.c')
| -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) { |