Skip to content

Commit

Permalink
Merge remote-tracking branch 'kagel/master'
Browse files Browse the repository at this point in the history
Conflicts:
	foobnix/fc/fc.py
	foobnix/gui/service/lastfm_service.py
  • Loading branch information
zavlab1 committed Dec 22, 2015
2 parents e6fde1f + fdc6256 commit bc87860
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion foobnix/gui/service/lastfm_service.py
Expand Up @@ -313,7 +313,7 @@ def events_to_models(self, events):
for artist in artists:
bean = FModel(artist.get_name()).parent(event_model).add_artist(artist.get_name()).add_is_file(True)
results.append(bean)
except Exception as e:
except Exception as e:
pass
return results

Expand Down

0 comments on commit bc87860

Please sign in to comment.