Resolve conflicts during import.

This commit is contained in:
kokarare1212
2021-05-21 12:32:15 +09:00
parent 8d86accf48
commit 6848f08448
7 changed files with 14 additions and 15 deletions

View File

@@ -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)