12 upstream commits, 29 files changes, 2 merge conflicts resolved (cps/editbooks.py cps/uploader.py) - Githubissues

iiab / calibre-web

:books: Web app for browsing, reading and downloading eBooks stored in a Calibre database

GNU General Public License v3.0

4 stars 5 forks source link

12 upstream commits, 29 files changes, 2 merge conflicts resolved (cps/editbooks.py cps/uploader.py) #240

Closed holta closed 3 months ago

holta commented 3 months ago

Resolving these 2 merge conflicts:

Removing Line 27 (from uuid import uuid4) from cps/editbooks.py: https://github.com/janeczku/calibre-web/commit/1eb77c9cd4c2daa44b1565ed37e29e15ba34eadc#diff-c53f5dabe25a508140e5d45c04c062dacc8fa9c2afca044bf6f78c8978093b77L27
Adding Line 95 / 101 (no_cover)) to cps/uploader.py: https://github.com/janeczku/calibre-web/commit/0f9b5d08e986eb27e30a36058ebb3bbd8383ef07#diff-6d498238f690a9a95e7cacfc13634211fb2126bee6be2f9f606847ac3e4aa7efR95

Replaces:

PR #239