From 770217513056ef60d5a10a705d8f75ca11d7d5af Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 26 九月 2021 17:18:09 +0800
Subject: [PATCH] update 修复合并异常

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

diff --git a/ruoyi-ui/public/favicon.ico b/ruoyi-ui/public/favicon.ico
new file mode 100644
index 0000000..e263760
--- /dev/null
+++ b/ruoyi-ui/public/favicon.ico
Binary files differ

--
Gitblit v1.9.3