X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/798c48a1a6ec32274ba031660bdd3eeef462e468..07504a9c1bb79da85fa407c8bc41bcc6d548e3c9:/templates/editpage.tmpl
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 8b755749f..6ab988261 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,10 @@ Optional comment about this change:
+
+
+Page preview:
+
+