X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3c239b14bc84e33535cb8980fcdcf8ab5d1022eb..7a9b8abd9232c11622211f4fcc16038a2fc847e6:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6aa9ecd1c..4724cd65f 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,9 +1,20 @@ + -<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.

@@ -12,22 +23,29 @@ confict and commit again to save your changes.

/

+ -Page location:
+Page location:
-
+
-Optional comment about this change:
-
+Optional comment about this change:
+
 +
-
+ +
+
+ +