fix conflict

2020-08-10 19:40:53 +08:00
parent 98900b516a
commit 6ac12a526c
9 changed files with 183 additions and 74 deletions
--- a/modules/mogo-module-v2x/src/main/res/values/strings.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/strings.xml
@@ -5,5 +5,6 @@
    <string name="v2x_help_speed_txt">车速</string>
    <string name="v2x_report_pop_submit_txt">已提交</string>
    <string name="v2x_report_pop_thank_txt">感谢已送达</string>
+    <string name="v2x_surrounding_top_brief">周围5公里，共 %d 条交通信息</string>

 </resources>