X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3c239b14bc84e33535cb8980fcdcf8ab5d1022eb..879f2f683e878ca859f98eb8b182002cdbc69a20:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6aa9ecd1c..b1cf015a2 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,33 +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. -
-