X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d593533af58d5133ef6ecfc4323e3e1d55d71c48..edfbd7e1aa8f9f2cb789f45c0668a0d987e0b368:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index fdb142c70..f8eda1b47 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,3 +1,4 @@ +

Your changes conflict with other changes made to the page. @@ -64,14 +65,13 @@ Optional comment about this change:

- + - + -
@@ -86,5 +86,3 @@ Optional comment about this change:
- -