From 902a537974ce0374d68d9e717febab7157a69286 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 13 十月 2022 09:43:54 +0800
Subject: [PATCH] 冲突

---
 src/assets/warningScreen/logo_dark.png |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/assets/warningScreen/logo_dark.png b/src/assets/warningScreen/logo_dark.png
index 8d9d810..96a4d41 100644
--- a/src/assets/warningScreen/logo_dark.png
+++ b/src/assets/warningScreen/logo_dark.png
Binary files differ

--
Gitblit v1.9.2