Conflicts: app/build.gradle app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt |
||
---|---|---|
.. | ||
AbsBaseActivity.kt | ||
AbsCastActivity.kt | ||
AbsMusicServiceActivity.kt | ||
AbsSlidingMusicPanelActivity.kt | ||
AbsThemeActivity.kt |
Conflicts: app/build.gradle app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt |
||
---|---|---|
.. | ||
AbsBaseActivity.kt | ||
AbsCastActivity.kt | ||
AbsMusicServiceActivity.kt | ||
AbsSlidingMusicPanelActivity.kt | ||
AbsThemeActivity.kt |