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"></span> <div class="name">3.1 设置</div> <div class="code-name">&#xe733;</div> @@ -97,6 +98,8 @@ </li> <li class="dib"> ======= >>>>>>> Stashed changes <span class="icon iconfont"></span> <div class="name">差</div> <div class="code-name">&#xe719;</div>