• 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
..
caches Loading commit data...
dictionaries Loading commit data...
libraries Loading commit data...
modules Loading commit data...
encodings.xml Loading commit data...
gradle.xml Loading commit data...
misc.xml Loading commit data...
modules.xml Loading commit data...
runConfigurations.xml Loading commit data...
souldfood_Assignment2.iml Loading commit data...
vcs.xml Loading commit data...
workspace.xml Loading commit data...