X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/03c98d3c79370157d94deef588415e778ab6ca87..93d77673e44c1c4019a2fcbae2e450f095c4426a:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 89f01e664..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: +
+
+ +
+