You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by jh...@apache.org on 2002/06/27 03:32:47 UTC
cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html package.html
jholmes 2002/06/26 18:32:46
Modified: src/share/org/apache/struts/taglib/html package.html
Log:
remove remnants from a merge conflict in the past
Revision Changes Path
1.14 +1 -1 jakarta-struts/src/share/org/apache/struts/taglib/html/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/package.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- package.html 25 Jun 2002 00:45:41 -0000 1.13
+++ package.html 27 Jun 2002 01:32:46 -0000 1.14
@@ -387,7 +387,7 @@
for that attribute.</p>
<pre> <html:messages id="message" header="errors.header" footer="errors.footer"><br> <li><bean:write name="message"/></li><br> </html:messages><br><br> errors.header=<h3><font color="red">Validation Error</font></h3><br> You must correct the following error(s) before proceeding:<UL><br> errors.footer=</ul><hr><br></pre>
- >>>>>>> 1.8
+
<h4><a name="doc.Other.errors">Displaying Error Messages</a>
</h4>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>