From 17c811378b06293b4e01a4b82c192c1cd40e29ca Mon Sep 17 00:00:00 2001 From: Lucien Gentis Date: Sun, 21 Jun 2015 13:48:14 +0000 Subject: XML update and conflict resolution with mod_log_forensic.html.fr git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1686720 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/upgrading.xml.meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/manual/upgrading.xml.meta') diff --git a/docs/manual/upgrading.xml.meta b/docs/manual/upgrading.xml.meta index 1d2a68a225..aba29996bb 100644 --- a/docs/manual/upgrading.xml.meta +++ b/docs/manual/upgrading.xml.meta @@ -8,6 +8,6 @@ en - fr + fr -- cgit v1.2.3