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-xxhdpi/function_notes.png |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/src/main/res/drawable-xxhdpi/function_notes.png b/app/src/main/res/drawable-xxhdpi/function_notes.png
index e5a6f62..594f81c 100644
--- a/app/src/main/res/drawable-xxhdpi/function_notes.png
+++ b/app/src/main/res/drawable-xxhdpi/function_notes.png
Binary files differ

--
Gitblit v1.9.1