X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/e41dd1e24e345c974fe4a070088f0d09d1b6ddac..acecbad0ff4a8c441da520522710dd5357ab31e0:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index f77f45036..d6ad80614 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,40 +1,60 @@ - - -
-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. -
-