From f325e58c5a08910e081698e702a6baf3ce00db54 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 08 九月 2022 16:58:14 +0800
Subject: [PATCH] 冲突

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

diff --git a/src/assets/warningScreen/small-full.png b/src/assets/warningScreen/small-full.png
index ea70b32..d985854 100644
--- a/src/assets/warningScreen/small-full.png
+++ b/src/assets/warningScreen/small-full.png
Binary files differ

--
Gitblit v1.9.2