[tomcat] branch 9.0.x updated: Fix merge error

2022-06-09 Thread markt
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 e93decd114 Fix merge error e93decd114 is described

Re: [tomcat] branch 9.0.x updated: Fix merge error

2021-04-01 Thread Rémy Maucherat
On Thu, Apr 1, 2021 at 3:14 PM wrote: > 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: > ne

[tomcat] branch 9.0.x updated: Fix merge error

2021-04-01 Thread markt
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