# Conflicts: # lib/app/app_controller.dart # test/features/settings_page_test.dart # test/test_support.dart |
||
|---|---|---|
| .. | ||
| app | ||
| data | ||
| features | ||
| i18n | ||
| models | ||
| runtime | ||
| theme | ||
| widgets | ||
| main.dart | ||
# Conflicts: # lib/app/app_controller.dart # test/features/settings_page_test.dart # test/test_support.dart |
||
|---|---|---|
| .. | ||
| app | ||
| data | ||
| features | ||
| i18n | ||
| models | ||
| runtime | ||
| theme | ||
| widgets | ||
| main.dart | ||