You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/09/13 22:34:47 UTC

svn commit: r280649 - /incubator/roller/branches/roller_2.0/web/website/edit-page.jsp

Author: snoopdave
Date: Tue Sep 13 13:34:45 2005
New Revision: 280649

URL: http://svn.apache.org/viewcvs?rev=280649&view=rev
Log:
Correcting merge problem

Modified:
    incubator/roller/branches/roller_2.0/web/website/edit-page.jsp

Modified: incubator/roller/branches/roller_2.0/web/website/edit-page.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/edit-page.jsp?rev=280649&r1=280648&r2=280649&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/edit-page.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/edit-page.jsp Tue Sep 13 13:34:45 2005
@@ -42,9 +42,6 @@
     <fmt:message key="pageForm.template" /><br />
     <html:textarea property="contents" cols="80" rows="30" style="width: 100%" />
             
-    <fmt:message key="pageForm.template" /><br />
-    <html:textarea property="contents" cols="80" rows="30" style="width: 100%" />
-            
     <html:hidden property="id"/>
     <html:hidden property="name"/>
     <input type="hidden" name="method" value="update" />