search

MusicMind / MusicMind-iOS

1 stars 1 forks source link

Issue 185 change spotify search functions #192

Closed RRuais closed 7 years ago

RRuais commented 7 years ago

Added pageViewController for SpotifyAudioPlayer to scroll through currentTracksInQueue and Scroll to end of tableView to load more searches into queue.

wvdk commented 7 years ago

Oh boy, quite a few merge conflicts. I recommend you attempt to merge develop into your branch and resolve any issues that occur.

I know for sure you can delete the cocoapods-generated test framework and config files:

MusicMind/Pods/Target Support Files/Pods-MusicMind-MusicMindTests/Pods-MusicMind-MusicMindTests-frameworks.sh
MusicMind/Pods/Target Support Files/Pods-MusicMind-MusicMindTests/Pods-MusicMind-MusicMindTests-resources.sh
MusicMind/Pods/Target Support Files/Pods-MusicMind-MusicMindTests/Pods-MusicMind-MusicMindTests.debug.xcconfig
MusicMind/Pods/Target Support Files/Pods-MusicMind-MusicMindTests/Pods-MusicMind-MusicMindTests.release.xcconfig