X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/5466a1daf99e8e4c67a19f871aaf558312569652..6479a7df146c1b06c74e2bfd461a9eaa6af33ff8:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index b7ec3fa2b..f63a4b089 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -2,52 +2,56 @@ "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.

-