From fb7a21523bc95d6d0872aaefa178156ae8965eba Mon Sep 17 00:00:00 2001
From: Michaël Ball <michael.ball@gmail.com>
Date: Sat, 18 Nov 2017 19:03:06 +0000
Subject: Fix merge mess-up

---
 lastfm_similarity.py | 4 ----
 1 file changed, 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
-- 
cgit v1.2.3