X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/190202dd4ee8c11dc60d5fa801ca19b4b7b0e3f6..4ddcd8a0b7ec44bcac7d7b82530ede7cf2ab0395:/templates/editpage.tmpl?ds=inline diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 08f160881..696c8dcad 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,93 +1,88 @@ - - -
--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. -
--Failed to save your changes. -
--Your changes were not able to be saved to disk. The system gave the error: -
--Your changes are preserved below, and you can try again to save them. - --
-The page you were editing has disappeared. -
--Perhaps someone else has deleted it or moved it. If you want to recreate -this page with your text, click "Save Page" again. -
--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. -
-" /> |