X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3c239b14bc84e33535cb8980fcdcf8ab5d1022eb..6b9082c643f4a90625c7bcaa1439846f64ad15ce:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6aa9ecd1c..f77f45036 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,9 +1,13 @@ + <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 +16,25 @@ confict and commit again to save your changes.

/

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

Page preview:

+ +