From a21a82b1b6f9e16bd45b177dad569f28da685c2d Mon Sep 17 00:00:00 2001
From: Elizabeth Myers <elizabeth@interlinked.me>
Date: Fri, 25 Mar 2016 21:05:39 -0500
Subject: [PATCH] Fix dangling line from merge

---
 authd/authd.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/authd/authd.c b/authd/authd.c
index b4502a68..8097679b 100644
--- 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,