fixed conflict

This commit is contained in:
lixiaopeng
2020-09-21 11:31:24 +08:00
parent 6b45d7d906
commit b664e452b4

View File

@@ -87,7 +87,7 @@
<dimen name="tanlu_module_card_margin_top">13px</dimen>
<dimen name="tanlu_module_card_margin_left">8px</dimen>
<dimen name="tanlu_module_margin_right">13px</dimen>
<dimen name="tanlu_module_margin_right">7px</dimen>
<dimen name="tanlu_module_margin_left">17px</dimen>
<dimen name="tanlu_module_margin_top">3px</dimen>
<dimen name="tanlu_module_mavi_height">18px</dimen>