X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/edfbd7e1aa8f9f2cb789f45c0668a0d987e0b368..d9d910f6765de6ba07508ab56a5a0f93edb4c8ad:/templates/editpage.tmpl
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index f8eda1b47..6d8a902a2 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,52 +1,13 @@
+
-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. -
-