I'll get used to this git thing one day. Cleaning up.

This commit is contained in:
kerobaros 2014-10-24 21:36:30 -05:00
parent d06da6381f
commit f782dfd376

View file

@ -165,7 +165,6 @@ def embed_album(album, maxwidth=None, quiet=False):
for item in album.items():
embed_item(item, imagepath, maxwidth, None,
config['embedart']['compare_threshold'].get(int),
<<<<<<< HEAD
config['embedart']['ifempty'], asalbum=True)
@ -176,9 +175,6 @@ def resize_image(imagepath, maxwidth):
.format(maxwidth))
imagepath = ArtResizer.shared.resize(maxwidth, syspath(imagepath))
return imagepath
=======
config['embedart']['ifempty'].get(bool))
>>>>>>> upstream/master
def check_art_similarity(item, imagepath, compare_threshold):