Skip to content
Browse files

Merge commit 'origin/master' into autofailover

Conflicts:
	config.c
  • Loading branch information...
2 parents 72ad378 + 8200b68 commit cd3a280804a01c5270c5c743e5822c7beb9ac77a Greg Smith committed Jun 7, 2011
Showing with 1 addition and 0 deletions.
  1. +1 −0 config.c
View
1 config.c
@@ -170,6 +170,7 @@ parse_line(char *buff, char *name, char *value)
trim(value);
}
+<<<<<<< HEAD:config.c
bool
reload_configuration(char *config_file, t_configuration_options *orig_options)

0 comments on commit cd3a280

Please sign in to comment.
Something went wrong with that request. Please try again.