Conflicts: app/build.gradle app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt |
||
|---|---|---|
| .. | ||
| assets | ||
| java/code/name/monkey/retromusic | ||
| res | ||
| AndroidManifest.xml | ||
| ic_launcher-playstore.png | ||
| ic_launcher-web.png | ||
Conflicts: app/build.gradle app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt |
||
|---|---|---|
| .. | ||
| assets | ||
| java/code/name/monkey/retromusic | ||
| res | ||
| AndroidManifest.xml | ||
| ic_launcher-playstore.png | ||
| ic_launcher-web.png | ||