9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix dangling line from merge

Browse source
This commit is contained in:
Elizabeth Myers 2016-03-25 21:05:39 -05:00
parent f49198a67f
commit a21a82b1b6
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
authd/authd.c
View file

@ -29,7 +29,6 @@ static void handle_stat(int parc, char *parv[]);
rb_helper *authd_helper = NULL; rb_helper *authd_helper = NULL;
authd_cmd_handler authd_cmd_handlers[256] = { authd_cmd_handler authd_cmd_handlers[256] = {
<<<<<<< HEAD
['C'] = handle_new_connection, ['C'] = handle_new_connection,
['D'] = resolve_dns, ['D'] = resolve_dns,
['R'] = handle_reload, ['R'] = handle_reload,