X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/5591d621b90855beeb5460f0ac11279d19835699..190a845fe1ab44d3947f2ecdc0305a180e21e6f2:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 1733483d3..4b54db2d1 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,48 +1,49 @@ - - - - -<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 +
+ + + + + + + + +
+
+ -
+ -