From 2475c65a3c091cee4fe48f49e0f53697403750df Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 17 八月 2022 19:55:34 +0800
Subject: [PATCH] 冲突

---
 src/assets/loginPage/map-bg.jpg |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/assets/loginPage/map-bg.jpg b/src/assets/loginPage/map-bg.jpg
index a377e7c..d8d3715 100644
--- a/src/assets/loginPage/map-bg.jpg
+++ b/src/assets/loginPage/map-bg.jpg
Binary files differ

--
Gitblit v1.9.2