From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 12 Aug 2017 23:13:38 +0000 (+0200)
Subject: server: Fix typo in comment.
X-Git-Tag: v0.6.1~19
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=1e188f3ad67851a95a65cfdae976b9e92d244ee9;p=paraslash.git

server: Fix typo in comment.

Introduced in the lopsub conversion patch.
---

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);