A "HEAD" word remaining from a merge conflict was accidentally left

in... removing it
2026-03-22 22:56:29 +00:00 · 2011-06-10 21:16:07 -05:00
parent 1d05467df1
commit 3f4ff5a862
1 changed files with 0 additions and 2 deletions
--- a/config.c
+++ b/config.c
@@ -170,8 +170,6 @@ parse_line(char *buff, char *name, char *value)
 	trim(value);
 }

-<<<<<<< HEAD:config.c
-
 bool
 reload_configuration(char *config_file, t_configuration_options *orig_options)
 {