# Conflicts: # lib/app/app_controller.dart # test/features/settings_page_test.dart # test/test_support.dart |
||
|---|---|---|
| .. | ||
| app_controller.dart | ||
| app_metadata.dart | ||
| app_shell.dart | ||
| app.dart | ||
# Conflicts: # lib/app/app_controller.dart # test/features/settings_page_test.dart # test/test_support.dart |
||
|---|---|---|
| .. | ||
| app_controller.dart | ||
| app_metadata.dart | ||
| app_shell.dart | ||
| app.dart | ||