X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/44eefb7f22d946c70429cdba7a6c90f6ffcbb6d3..7b4600df3f8b8c2112a8df6c018d64f04db1ebe8:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index c23630dfa..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,9 +27,12 @@ Optional comment about this change:
-

+ +

Page preview:

+ +