X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/3c239b14bc84e33535cb8980fcdcf8ab5d1022eb..e059c9eff94ab37598d740cc5777e591216368a1:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6aa9ecd1c..cf4520575 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,33 +1,53 @@ + -<TMPL_VAR FORM-TITLE> + + + + + +<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: +
 -
+
-Optional comment about this change:
-
+Optional comment about this change:
+
 + -
-

Page preview:

+
+
+Page preview: +
+
+