Author: kkolinko
Date: Wed Jun 6 12:52:20 2012
New Revision: 1346864
URL: http://svn.apache.org/viewvc?rev=1346864&view=rev
Log:
Remove svn:merge-info property on EchoMessage.java, that was added in r1346684
Note: Merges should be started from project root - tc7.0.x/trunk, and project
root has
to be included in subsequent commit. That way svn:merge-info will be present
only on the project root directory.
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
(props changed)
Propchange:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
('svn:mergeinfo' removed)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
