X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1626831cc85307682610e58f4bca2a4b7c583024..9a62836d288fbced42b04a172baf52063ef71c61:/templates/editpage.tmpl?ds=inline diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index f63a4b089..4b54db2d1 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,33 +1,12 @@ - - -
--Your changes conflict with other changes made to the page. -
--Conflict markers have been inserted into the page content. Reconcile the -conflict and commit again to save your changes. -
-