error500 0345a310e5 Merge branch 'backend_nfc' into ns_bank_merge ... # Conflicts: # lib/core/logger.dart # lib/core/models/check_data.dart # lib/core/router.dart # lib/core/services/DataService.dart # lib/main.dart # lib/redux/store.dart # lib/views/check/image_show_container.dart # lib/views/history/history_view.dart # lib/views/home/home_view_m.dart # lib/views/home/tabs/AdditionalTab.dart # lib/views/login/login_view.dart # lib/views/payment/payment_view.dart # lib/views/start_up/start_up_view.dart # pubspec.lock # pubspec.yaml		2022-01-25 17:04:36 +06:00
..
halyk	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00
aman_dao.dart	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00
auth_response.dart	migrate initial	2022-01-25 13:42:34 +06:00
calc_model.dart	migrate initial	2022-01-25 13:42:34 +06:00
card_data.dart	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00
check_data.dart	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00
check_image_modal.dart	migrate initial	2022-01-25 13:42:34 +06:00
check_item.dart	migrate initial	2022-01-25 13:42:34 +06:00
choice.dart	migrate initial	2022-01-25 13:42:34 +06:00
close_day_data.dart	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00
dialog_models.dart	migrate initial	2022-01-25 13:42:34 +06:00
dict_dao.dart	migrate initial	2022-01-25 13:42:34 +06:00
message.dart	migrate initial	2022-01-25 13:42:34 +06:00
money.dart	migrate initial	2022-01-25 13:42:34 +06:00
product_dao.dart	migrate initial	2022-01-25 13:42:34 +06:00
response.dart	migrate initial	2022-01-25 13:42:34 +06:00
setting_model.dart	migrate initial	2022-01-25 13:42:34 +06:00
smena.dart	migrate initial	2022-01-25 13:42:34 +06:00
transaction_item.dart	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00
user.dart	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00