Author: markt
Date: Mon Oct 2 20:21:07 2017
New Revision: 1810592
URL: http://svn.apache.org/viewvc?rev=1810592&view=rev
Log:
Remove previous merge conflict
Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1810592&r1=1810591&r2=1810592&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Oct 2 20:21:07 2017
@@ -111,24 +111,11 @@
<bug>61452</bug>: Fix a copy paste error that caused an
<code>UnsupportedEncodingException</code> when using WebDAV. (markt)
</fix>
-<<<<<<< .working
<fix>
Correct regression in 7.0.80 that broke the use of relative paths with
the <code>extraResourcePaths</code> attribute of a
<code>VirtualDirContext</code>. (markt)
</fix>
-||||||| .merge-left.r1810587
- <fix>
- <bug>61437</bug>: Fix a possible <code>AccessControlException</code>
- accessing the WebSocket examples when running under a
- <code>SecurityManager</code>. (markt)
- </fix>
- <fix>
- <bug>61452</bug>: Fix a copy paste error that caused an
- <code>UnsupportedEncodingException</code> when using WebDAV. (markt)
- </fix>
-=======
->>>>>>> .merge-right.r1810588
<add>
<bug>61489</bug>: When using the CGI servlet, make the generation of
command line arguments from the query string (as per section 4.4 of RFC
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
