From b664e452b4c41e1fb5eaffb85d7e6b912d303a03 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 21 Sep 2020 11:31:24 +0800 Subject: [PATCH] fixed conflict --- modules/mogo-module-tanlu/src/main/res/values/dimens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index 6936d6835c..6bea08321b 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -87,7 +87,7 @@ 13px 8px - 13px + 7px 17px 3px 18px