cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html package.html

[jholmes]

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>  &lt;html:messages id="message" header="errors.header" 
footer="errors.footer"&gt;<br>     &lt;li&gt;&lt;bean:write 
name="message"/&gt;&lt;/li&gt;<br>  &lt;/html:messages&gt;<br><br>  
errors.header=&lt;h3&gt;&lt;font color="red"&gt;Validation 
Error&lt;/font&gt;&lt;/h3&gt;<br>    You must correct the following error(s) before 
proceeding:&lt;UL&gt;<br>  errors.footer=&lt;/ul&gt;&lt;hr&gt;<br></pre>
  -  &gt;&gt;&gt;&gt;&gt;&gt;&gt; 1.8  
  +
   <h4><a name="doc.Other.errors">Displaying Error Messages</a>
    </h4>
      
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>