• 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
..
activity_home_screen.xml Loading commit data...
activity_loading_screen.xml Loading commit data...
activity_main.xml Loading commit data...
activity_playlist_view.xml Loading commit data...
activity_saved_playlists.xml Loading commit data...
activity_search_screen.xml Loading commit data...
activity_settings.xml Loading commit data...
activity_song_information_page.xml Loading commit data...
activity_song_screen_view2.xml Loading commit data...
activity_song_with_tag_view.xml Loading commit data...
activity_swt_view_screen.xml Loading commit data...
build_playlist.xml Loading commit data...