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
..
bank_setting	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00
bank_view	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00
check	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00
close_day_view	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00
history	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00
home	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00
info_kkm	migrate initial	2022-01-25 13:42:34 +06:00
lockscreen	migrate initial	2022-01-25 13:42:34 +06:00
login	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00
payment	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00
payment_nfc	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00
qr_view	migrate initial	2022-01-25 13:42:34 +06:00
settings	Merge branch 'backend_nfc' into ns_bank_merge	2022-01-25 17:04:36 +06:00
start_up	migrate initial	2022-01-25 13:42:34 +06:00