X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=server.c;h=c5f9ede61a92be19c4a8580b0eaf01ca4bf4e319;hb=fe3d9cd155b5eac8706015854c343440823e12da;hp=6529073fd4cec30e446ff70d6bc5eb593cf3ec0a;hpb=e0df7b89fb8a7e7b7164d036e437c9862d23989a;p=paraslash.git

diff --git a/server.c b/server.c
index 6529073f..c5f9ede6 100644
--- a/server.c
+++ b/server.c
@@ -211,7 +211,7 @@ void parse_config_or_die(bool reload)
 	if (reload) /* config file overrides command line */
 		ret = lls(lls_merge(cf_lpr, cmdline_lpr, CMD_PTR, &merged_lpr,
 			&errctx));
-	else /* command line options overrride config file options */
+	else /* command line options override config file options */
 		ret = lls(lls_merge(cmdline_lpr, cf_lpr, CMD_PTR, &merged_lpr,
 			&errctx));
 	lls_free_parse_result(cf_lpr, CMD_PTR);