From d5d541f6bc23fd70875bbc706639b7e48d50468a Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期二, 04 四月 2023 20:36:41 +0800
Subject: [PATCH] 更改解决冲突
---
app/src/main/res/drawable/shape_73fab4cd_solid.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/drawable/shape_73fab4cd_solid.xml b/app/src/main/res/drawable/shape_73fab4cd_solid.xml
index 7c318ce..302267a 100644
--- a/app/src/main/res/drawable/shape_73fab4cd_solid.xml
+++ b/app/src/main/res/drawable/shape_73fab4cd_solid.xml
@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:shape="rectangle">
- <solid android:color="#73fab4cd" />
- <corners android:topLeftRadius="10dp" android:topRightRadius="10dp" android:bottomLeftRadius="10dp" android:bottomRightRadius="10dp" />
+ <solid android:color="#73FAB4CD" />
+ <corners android:radius="10dp" />
</shape>
\ No newline at end of file
--
Gitblit v1.9.1