fe / yohobuy-node · Commits

Go to a project

Authored by 郝肖肖
Commit 9cc332fc2003e9fef03b7a4faeaaee1463d65c4d 1 parent 8d45c39d

修复冲突

Inline Side-by-side
Showing 1 changed file with 1 additions and 5 deletions
... ... @@ -17,11 +17,7 @@
</div>
<div class="left swindle-info">
<a href="//www.yohobuy.com/help/detail?id=103" target="_blank">
<<<<<<< HEAD
<i class="iconfont">&#xe706;</i>关于防诈骗的重要提醒
=======
<i class="iconfont left">&#xe6ed;</i>关于防诈骗的重要提醒
>>>>>>> d843dacbd971592e85ffb86a67b55116ab7e73ae
<i class="iconfont left">&#xe706;</i>关于防诈骗的重要提醒
</a>
</div>
<div class="left yoho-cert-tip"></div>
... ...