+
X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;ds=sidebyside;f=templates%2Feditpage.tmpl;h=36076cb3534bfb269e2cb174784be90ceee88deb;hb=23aaa5ac45f389a741afdac6d87e077a2e44fe8b;hp=15a4069c00325000cd913bb2cf784e4cc8df7f95;hpb=072967e62a06936dd082f02ae5d8fd6103f2e16c;p=ikiwiki.git diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 15a4069c0..36076cb35 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,79 +1,67 @@ - - -
--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. -
-