X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c20c4066311341e332dc425023f856b6414de9ae..c1cd9b6b3305b699ce9990bc5ca27a7170643ede:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index ec48df4c2..f63a4b089 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -2,21 +2,23 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - - <TMPL_VAR FORM-TITLE> - + + + + +

-Your changes confict with other changes made to the page. +Your changes conflict 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. +conflict and commit again to save your changes.

@@ -28,27 +30,28 @@ confict and commit again to save your changes. Page location: +Page type:
+
Optional comment about this change:

 - + + -
+
Page preview:
- -