X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/e41dd1e24e345c974fe4a070088f0d09d1b6ddac..6fb04eaf8daa3ffebb9b5856fa8d222f5c2e9e11:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index f77f45036..b1cf015a2 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,40 +1,50 @@ - - -
-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. -
-