X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/fa96eab12016e2f29a0a3522f1229039fbbf2c5e..d8ed0007e646e7e369920f495d9cf5a5b91fdb6b:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index a5c44dc4c..4b54db2d1 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,33 +1,12 @@ - - - - - -<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 type: @@ -43,15 +22,28 @@ Optional comment about this change:
+ +Attachments +
+ + + + + + + + +
+
+
+
Page preview:
-
+
- -