Resolve conflicts during import.
This commit is contained in:
@@ -241,11 +241,11 @@ class Session(Closeable, SubListener, DealerClient.MessageListener):
|
||||
with self._authLock:
|
||||
self._mercuryClient = MercuryClient(self)
|
||||
self._tokenProvider = TokenProvider.TokenProvider(self)
|
||||
self._audioKeyManager = AudioKeyManager(self)
|
||||
self._audioKeyManager = AudioKeyManager.AudioKeyManager(self)
|
||||
self._channelManager = ChannelManager(self)
|
||||
self._api = ApiClient.ApiClient(self)
|
||||
self._cdnManager = CdnManager.CdnManager(self)
|
||||
self._contentFeeder = PlayableContentFeeder(self)
|
||||
self._cdnManager = CdnManager(self)
|
||||
self._contentFeeder = PlayableContentFeeder.PlayableContentFeeder(self)
|
||||
self._cacheManager = CacheManager(self)
|
||||
self._dealer = DealerClient(self)
|
||||
self._search = SearchManager.SearchManager(self)
|
||||
|
||||
Reference in New Issue
Block a user