summaryrefslogtreecommitdiff
path: root/lastfm_similarity.py
diff options
context:
space:
mode:
authorMichaël Ball <michael.ball@gmail.com>2017-11-18 19:03:06 +0000
committerMichaël Ball <michael.ball@gmail.com>2017-11-18 19:03:06 +0000
commitfb7a21523bc95d6d0872aaefa178156ae8965eba (patch)
tree3ae19eeae976fb9c1d2e2bdfc2b6b03a4a60e443 /lastfm_similarity.py
parentb11a7291998680212e1bac2fdb689db68e440ba4 (diff)
Fix merge mess-up
Diffstat (limited to 'lastfm_similarity.py')
-rw-r--r--lastfm_similarity.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/lastfm_similarity.py b/lastfm_similarity.py
index 3df6241..550f88c 100644
--- a/lastfm_similarity.py
+++ b/lastfm_similarity.py
@@ -244,8 +244,4 @@ class LastFMSimilarity(EventPlugin):
if artist_count > self._blacklist_artist_count:
self._last_artists = self._last_artists[
-<<<<<<< HEAD
- (artist_count - max_artist_count):artist_count]
-=======
(artist_count - self._blacklist_artist_count):artist_count]
->>>>>>> 8362451... Add preferences