From 2e11b2e5684dc28cbd1fe16ef53929ceedfdcf66 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 25 Sep 2020 11:55:01 +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 af1c70909d..955ea90977 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -84,7 +84,7 @@ 45px 13px - 6px + 8px 7px 17px 3px