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