X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3da279ddd4f3e18b1fcc964b0abc71ebfd6979dd..b23ddf6c4a955dc4da8266880d27e25073ee7e06:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 987531803..b1cf015a2 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,46 +1,6 @@
- -

-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. -

- + @@ -71,12 +31,13 @@ Optional comment about this change:
- + +