Conflict files fixed up to a state where tests pass again before commit. Conflicts: mopidy/audio/actor.py mopidy/audio/listener.py tests/audio/test_actor.py tests/audio/test_listener.py |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| test_actor.py | ||
| test_listener.py | ||
| test_playlists.py | ||
| test_scan.py | ||