解决冲突

2021-05-26 19:01:46 +08:00
parent 80893ca08f 3b0581c621
commit b0526a0eb1
35 changed files with 628 additions and 43 deletions
--- a/app/src/main/res/mipmap-xxhdpi/article.png
+++ b/app/src/main/res/mipmap-xxhdpi/article.png
--- a/app/src/main/res/mipmap-xxhdpi/article_select.png
+++ b/app/src/main/res/mipmap-xxhdpi/article_select.png
--- a/app/src/main/res/mipmap-xxhdpi/bg.png
+++ b/app/src/main/res/mipmap-xxhdpi/bg.png
--- a/app/src/main/res/mipmap-xxhdpi/checkbox.png
+++ b/app/src/main/res/mipmap-xxhdpi/checkbox.png
--- a/app/src/main/res/mipmap-xxhdpi/checkbox_checked.png
+++ b/app/src/main/res/mipmap-xxhdpi/checkbox_checked.png
--- a/app/src/main/res/mipmap-xxhdpi/icon_goback.png
+++ b/app/src/main/res/mipmap-xxhdpi/icon_goback.png
--- a/app/src/main/res/mipmap-xxhdpi/map.png
+++ b/app/src/main/res/mipmap-xxhdpi/map.png
--- a/app/src/main/res/mipmap-xxhdpi/map_select.png
+++ b/app/src/main/res/mipmap-xxhdpi/map_select.png
--- a/app/src/main/res/mipmap-xxhdpi/mine.png
+++ b/app/src/main/res/mipmap-xxhdpi/mine.png
--- a/app/src/main/res/mipmap-xxhdpi/mine_select.png
+++ b/app/src/main/res/mipmap-xxhdpi/mine_select.png
--- a/app/src/main/res/mipmap-xxhdpi/task.png
+++ b/app/src/main/res/mipmap-xxhdpi/task.png
--- a/app/src/main/res/mipmap-xxhdpi/task_select.png
+++ b/app/src/main/res/mipmap-xxhdpi/task_select.png