# Conflicts: # lib/core/services/DataService.dart # lib/views/start_up/start_up_view.dart # pubspec.lock # pubspec.yaml |
||
|---|---|---|
| .. | ||
| bank_actions.dart | ||
| calc_actions.dart | ||
| kassa_actions.dart | ||
| setting_actions.dart | ||
| user_actions.dart | ||
# Conflicts: # lib/core/services/DataService.dart # lib/views/start_up/start_up_view.dart # pubspec.lock # pubspec.yaml |
||
|---|---|---|
| .. | ||
| bank_actions.dart | ||
| calc_actions.dart | ||
| kassa_actions.dart | ||
| setting_actions.dart | ||
| user_actions.dart | ||