diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html index 5139683a..474cfaae 100644 --- a/cps/templates/book_edit.html +++ b/cps/templates/book_edit.html @@ -150,9 +150,7 @@ -<<<<<<< HEAD -======= {% endblock %} {% block header %} diff --git a/cps/templates/detail.html b/cps/templates/detail.html index 9639e954..ce7e179a 100644 --- a/cps/templates/detail.html +++ b/cps/templates/detail.html @@ -126,7 +126,7 @@
diff --git a/cps/web.py b/cps/web.py index 5d932ec9..a49cdbb7 100755 --- a/cps/web.py +++ b/cps/web.py @@ -1308,7 +1308,6 @@ def read_book(book_id, format): flash(_(u"Error opening eBook. File does not exist or file is not accessible:"), category="error") return redirect(url_for("index")) - @app.route("/download/