From 849a9907e793fed3bb18df542090e4a1f4e4f429 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期一, 28 八月 2023 11:58:55 +0800
Subject: [PATCH] 冲突

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

diff --git a/screen_standard/public/favicon.ico b/screen_standard/public/favicon.ico
index df36fcf..deac355 100644
--- a/screen_standard/public/favicon.ico
+++ b/screen_standard/public/favicon.ico
Binary files differ

--
Gitblit v1.9.3