X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/6b6fd778c7b35961736e9087f56e3872f6d9bdc9..9f7298d4fe172d54bcdd94ed43e42aee08aecb8f:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6ab988261..4b54db2d1 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,36 +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:
-
+Optional comment about this change:
+
 + + +Attachments +
+ + + + + + + + +
+
+ + -
-

Page preview:

+
+
+Page preview: +
+
+
 - -