This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 97e6911 Fix merge error
97e6911 is described below
commit 97e6911953f21815a0e2f9e774dd0b35e622c902
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 1 14:13:34 2021 +0100
Fix merge error
---
webapps/docs/changelog.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 98899d4..55e5ff8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,10 +103,7 @@
They eventually become mixed with the numbered issues (i.e., numbered
issues do not "pop up" wrt. others).
-->
-<<<<<<< HEAD
<section name="Tomcat 9.0.46 (markt)" rtext="in development">
-=======
-<section name="Tomcat 10.0.6 (markt)" rtext="in development">
<subsection name="Other">
<changelog>
<fix>
@@ -117,7 +114,6 @@
</fix>
</changelog>
</subsection>
->>>>>>> 5651dfad39... Remove Bnd annotation dependency from Jakarta API JARs
</section>
<section name="Tomcat 9.0.45 (markt)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
