This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a63ed576610f1fe46b689f8e672cfb0255e08428 Author: remm <r...@apache.org> AuthorDate: Wed Sep 1 13:47:17 2021 +0200 Fix bad merge --- webapps/docs/changelog.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index aa5a111..abb2055 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -199,7 +199,6 @@ Update to JSign version 4.0 to enable code signing without the need for the installation of additional client tools. (markt) </update> -<<<<<<< HEAD <add> Update the internal fork of Apache Commons BCEL to 40d5eb4 (2021-09-01, 6.6.0-SNAPSHOT). Code clean-up only. (markt) @@ -208,12 +207,10 @@ Update the internal fork of Apache Commons Codec to fd44e6b (2021-09-01, 1.16-SNAPSHOT). Minor refactoring. (markt) </add> -======= <update> Add Apache Derby 10.14.2.0 to the testsuite dependencies, for JDBC and DataSource testing. (remm) </update> ->>>>>>> 86177f0839 (Add Derby for the testsuite) </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org