X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/03c98d3c79370157d94deef588415e778ab6ca87..4eaa8ef15c2b8cdd647ae2ea691014c2a22c6d6e:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 89f01e664..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.

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

 - + + -
+
Page preview:
- -