Fix dangling line from merge

diff --git a/authd/authd.c b/authd/authd.c
index b4502a6854bc39a925bc3183cfc502829de1f45d..8097679b4c8558988db8f8ee6df3bc175c5375a7 100644 (file)
--- a/authd/authd.c
+++ b/authd/authd.c
@@ -29,7 +29,6 @@ static void handle_stat(int parc, char *parv[]);
 
 rb_helper *authd_helper = NULL;
 authd_cmd_handler authd_cmd_handlers[256] = {
-<<<<<<< HEAD
        ['C'] = handle_new_connection,
        ['D'] = resolve_dns,
        ['R'] = handle_reload,