1ea904ec8d
# Conflicts: # lib/ui/player_screen.dart # lib/ui/search.dart |
||
---|---|---|
.. | ||
app | ||
gradle/wrapper | ||
.gitignore | ||
build.gradle | ||
gradle.properties | ||
settings_aar.gradle | ||
settings.gradle |
1ea904ec8d
# Conflicts: # lib/ui/player_screen.dart # lib/ui/search.dart |
||
---|---|---|
.. | ||
app | ||
gradle/wrapper | ||
.gitignore | ||
build.gradle | ||
gradle.properties | ||
settings_aar.gradle | ||
settings.gradle |