From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict

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

diff --git a/src/assets/loginPage/xj-bg.png b/src/assets/loginPage/xj-bg.png
index f4b281f..e2317d1 100644
--- a/src/assets/loginPage/xj-bg.png
+++ b/src/assets/loginPage/xj-bg.png
Binary files differ

--
Gitblit v1.9.2