• jade.woodward's avatar
    redoing because conflict · 97b9b53f
    jade.woodward authored
    # Conflicts:
    #	app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.java
    #	app/src/main/res/layout/activity_saved_playlists.xml
    97b9b53f
Name
Last commit
Last update
..
AmericanAsyncTask.java Loading commit data...
AsyncronousTask.java Loading commit data...
BuildPlaylist.java Loading commit data...
ChillAsyncTask.java Loading commit data...
ChineseAsyncTask.java Loading commit data...
EnergeticAsyncTask.java Loading commit data...
FrenchAsyncTask.java Loading commit data...
HappyAsyncTask.java Loading commit data...
ImageDownload.java Loading commit data...
IndianAsyncTask.java Loading commit data...
ItalianAsyncTask.java Loading commit data...
JapaneseAsyncTask.java Loading commit data...
Listener.java Loading commit data...
MainActivity.java Loading commit data...
MexicanAsyncTask.java Loading commit data...
SavedPlaylists.java Loading commit data...
SongInformationPage.java Loading commit data...
SongScreenView.java Loading commit data...
SpotifyClass.java Loading commit data...
ThaiAsyncTask.java Loading commit data...
build_playlist.java Loading commit data...
databaseInterface.java Loading commit data...
homeScreen.java Loading commit data...
loadingScreen.java Loading commit data...
playlistView.java Loading commit data...
searchScreen.java Loading commit data...
settings.java Loading commit data...
swtViewScreen.java Loading commit data...