Fixed merging conflicts.

2015-02-24 06:34:22 +02:00
parent 9e7afeb302
commit 3b29e1a1f0
2 changed files with 1 additions and 5 deletions
--- a/server/core/config.c
+++ b/server/core/config.c
@ -324,7 +324,7 @@ int			error_count = 0;
 					is_rwsplit = true;
 				}

-				char *allow_localhost_match_wildcard_host =
+				allow_localhost_match_wildcard_host =
                                        config_get_value(obj->parameters, "localhost_match_wildcard_host");

                                if (obj->element == NULL) /*< if module load failed */