X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/798c48a1a6ec32274ba031660bdd3eeef462e468..af77087dc9f19b33ba278d1145c7b08063152692:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 8b755749f..c1e7113b4 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,10 +1,20 @@ <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:
@@ -17,5 +27,12 @@ Optional comment about this change:
+

+ +

Page preview:

+ + + +