# Conflicts: # lib/address/edit_address_page.dart # lib/generated/intl/messages_en.dart # lib/generated/intl/messages_zh_CN.dart # lib/generated/intl/messages_zh_Hans_CN.dart # lib/generated/intl/messages_zh_Hant_CN.dart # lib/generated/intl/messages_zh_TW.dart # lib/generated/l10n.dart # lib/home/points_mall_page.dart # lib/l10n/intl_en.arb # lib/l10n/intl_zh_CN.arb # lib/l10n/intl_zh_Hans_CN.arb # lib/l10n/intl_zh_Hant_CN.arb # lib/l10n/intl_zh_TW.arb # lib/mine/mine_page.dart