This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new d4f1aa1 Fix back-port error d4f1aa1 is described below commit d4f1aa132469fbdf78a8900b62d298f494f9159a Author: Mark Thomas <ma...@apache.org> AuthorDate: Wed Jun 10 20:50:32 2020 +0100 Fix back-port error --- webapps/docs/changelog.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4e19e8c..e034840 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -82,7 +82,6 @@ </fix> </changelog> </subsection> ->>>>>>> 4bd5c80e60... Fix BZ64501 - Avoid feature not available by default on Solaris 10 </section> <section name="Tomcat 8.5.56 (markt)" rtext="2020-06-07"> <subsection name="Catalina"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org