push request after conflict resolve

5 years ago · a33a6b0b2f
parent 0a3c44b5e8
commit a33a6b0b2f
2 changed files with 708 additions and 1703 deletions
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
--- a/lib/uitl/translations_delegate_base.dart
+++ b/lib/uitl/translations_delegate_base.dart