merge conflict

2017-03-08 23:52:41 +08:00 · 2017-03-08 23:52:41 +08:00 · a7d361a0ff
commit a7d361a0ff
parent dcc0958c39
1 changed files with 0 additions and 4 deletions
--- a/cps/web.py
+++ b/cps/web.py
@ -1331,11 +1331,7 @@ def get_download_link(book_id, format):
            response.headers["Content-Type"] = mimetypes.types_map['.' + format]
        except Exception as e:
            pass
-<<<<<<< HEAD
-        response.headers["Content-Disposition"] = "attachment; filename*=UTF-8''%s.%s" % (urllib.quote(file_name.encode('utf-8')), format)
-=======
        response.headers["Content-Disposition"] = "attachment; filename*=UTF-8''%s.%s" % (quote(file_name.encode('utf-8')), format)
->>>>>>> master
        return response
    else:
        abort(404)