From 584587a9d9932762aad2d27027be348c810926d0 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期四, 06 一月 2022 10:09:34 +0800
Subject: [PATCH] 冲突解决

---
 public/favicon.ico |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/favicon.ico b/public/favicon.ico
index c7b9a43..9b761ef 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ

--
Gitblit v1.8.0