Resolve conflicts during import.

2021-05-21 12:32:15 +09:00
parent 8d86accf48
commit 6848f08448
7 changed files with 14 additions and 15 deletions
--- a/librespot/audio/decrypt/AesAudioDecrypt.py
+++ b/librespot/audio/decrypt/AesAudioDecrypt.py
@@ -1,6 +1,6 @@
 from Crypto.Cipher import AES
 from Crypto.Util import Counter
-from librespot.audio.storage.ChannelManager import ChannelManager
+from librespot.audio.storage import ChannelManager
 from librespot.audio.decrypt.AudioDecrypt import AudioDecrypt
 import time