X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/072967e62a06936dd082f02ae5d8fd6103f2e16c..583cfab61438289db843a9c01d66f362efb77e01:/templates/editpage.tmpl?ds=inline diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 15a4069c0..d418bac69 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,14 +1,14 @@ - +
-+While you were creating this page, someone else independently created a page +with the same name. +
++The edit box below contains the page's current content, followed by the +content you entered previously, to allow you to merge the two +together before saving. +
+