X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1d82816082b2a3dee97a1812410962a41f1b6e79..c5d63c549de267dfc5de44f60b619f576e57023d:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index c1e7113b4..4736c95d0 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,38 +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. -
-" /> |