[balsa/wip/gtk4] balsa-index: Fix the build

[Peter Bloomfield <peterb src gnome org>]

commit 8d1b34af23c9b17fc502dbb299cc5784e264826e
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Fri Jun 1 08:06:06 2018 -0400

    balsa-index: Fix the build

 src/balsa-index.c | 6 ------
 1 file changed, 6 deletions(-)
---
diff --git a/src/balsa-index.c b/src/balsa-index.c
index 87cf19ec..419d04ed 100644
--- a/src/balsa-index.c
+++ b/src/balsa-index.c
@@ -2743,16 +2743,10 @@ bndx_pipe_queue_last(struct BndxPipeQueue *queue)
         g_io_channel_set_close_on_unref(pipe->out_channel, TRUE);
         g_io_channel_set_close_on_unref(pipe->err_channel, TRUE);
     } else {
-<<<<<<< HEAD
-        printf("Could not spawn pipe %s : %s\n", queue->pipe_cmd,
-               error ? error->message : "unknown");
-        g_clear_error(&error);
-=======
        printf("Could not spawn pipe %s : %s\n", queue->pipe_cmd,
               error ? error->message : "unknown");
        g_clear_error(&error);
        g_free(pipe->message);
->>>>>>> 102ed47c... balsa-index: Do not leak PipeData
         g_free(pipe);
     }
 }