# Conflicts: # .idea/libraries/Dart_Packages.xml # .idea/libraries/Dart_SDK.xml # Sources/dafl_project_flutter/lib/model/music.dart # Sources/dafl_project_flutter/lib/model/user.dart # Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart