X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/5466a1daf99e8e4c67a19f871aaf558312569652..aaaef740107aacd8f6987711da6895c02e4473ad:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index b7ec3fa2b..b1cf015a2 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,53 +1,50 @@ - - - - - - - -<TMPL_VAR FORM-TITLE> - - - - -

-Your changes confict with other changes made to the page. -

-

-Conflict markers have been inserted into the page content. Reconcile the -confict and commit again to save your changes. -

- +
+ + - + + -Page location:
+Page location: +Page type: +
+ -
+
Optional comment about this change:

 + + +Attachments +
+ + + + + + + + +
+
+ -
+ + -