X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=templates%2Feditpage.tmpl;h=d6ad8061420f2c8056b6c1d12f3da6223ba0582f;hb=3d7147992ab24d953c87b91f75851ca45895073c;hp=ad1faa3a541540d2b629f315b8f12e5f897ba765;hpb=96eb9bb3fa1d805df967f44d13876f57b8ea121d;p=ikiwiki.git diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index ad1faa3a5..d6ad80614 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,57 +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: -Page type: + + -
 +

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