X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/1452b3adf30145e8fd1208ac73da9d12967863bc..89ef7ad8e894e7e9b39c30e9eea255c4e8b9b71b:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index cf4520575..d6ad80614 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,53 +1,60 @@ - - - - - - - -<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: + + -
+ +

+
-Optional comment about this change:
-
+ +
 + +Attachments +
+ + + + + + + + +
+
+ + +
Page preview:
-
+
- - + +
+
+Diff: +
+
+ +
+