X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/03c98d3c79370157d94deef588415e778ab6ca87..61c4129aaaa5ce1849023aa9f12f32ff98eb52fb:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 89f01e664..4b54db2d1 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,53 +1,49 @@ - - -
--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. -
-