From e815b477b8619f8ad23fe08b9039c8d5f3f57cfc Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期一, 27 九月 2021 14:07:11 +0800
Subject: [PATCH] 个性化设置

---
 public/fonts/alibaba/demo_index.html |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/public/fonts/alibaba/demo_index.html b/public/fonts/alibaba/demo_index.html
index 3f242c6..920ce9b 100644
--- a/public/fonts/alibaba/demo_index.html
+++ b/public/fonts/alibaba/demo_index.html
@@ -55,6 +55,7 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+<<<<<<< Updated upstream
               <span class="icon iconfont">&#xe733;</span>
                 <div class="name">3.1 璁剧疆</div>
                 <div class="code-name">&amp;#xe733;</div>
@@ -97,6 +98,8 @@
               </li>
           
             <li class="dib">
+=======
+>>>>>>> Stashed changes
               <span class="icon iconfont">&#xe719;</span>
                 <div class="name">宸�</div>
                 <div class="code-name">&amp;#xe719;</div>

--
Gitblit v1.8.0