From: Christophe Jaillet <jailletc36@apache.org>
Date: Sat, 23 May 2020 09:33:58 +0000 (+0000)
Subject: Axe an empty line to synch with 2.4.x.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1425
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e978a68071d2c595b24811fc7bec331c96d2cdb;p=thirdparty%2Fapache%2Fhttpd.git

Axe an empty line to synch with 2.4.x.
This was a left over from r1855705 when it has been merged.

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1878048 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/core.c b/server/core.c
index f1015e05b17..a0e10fec23b 100644
--- a/server/core.c
+++ b/server/core.c
@@ -4950,7 +4950,6 @@ AP_INIT_FLAG("MergeSlashes", set_core_server_flag,
              (void *)APR_OFFSETOF(core_server_config, merge_slashes),  
              RSRC_CONF,
              "Controls whether consecutive slashes in the URI path are merged"),
-
 { NULL }
 };