fixed conflict

This commit is contained in:
lixiaopeng
2020-09-25 11:55:01 +08:00
parent 865d53a421
commit 2e11b2e568

View File

@@ -84,7 +84,7 @@
<dimen name="tanlu_module_close_height">45px</dimen>
<dimen name="tanlu_module_card_margin_top">13px</dimen>
<dimen name="tanlu_module_card_margin_left">6px</dimen>
<dimen name="tanlu_module_card_margin_left">8px</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>