Skip to content

Z
zsh
Commit 76b4a9da authored by wuwz's avatar wuwz
Browse files
Options

chongtu

parent ef6f58d8
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
WebRoot/WEB-INF/templates/zh_cn/system/user/default/usercenter/account_nav.html
View file @ 76b4a9da
...@@ -50,11 +50,7 @@ jQuery(document).ready(function(){ ...@@ -50,11 +50,7 @@ jQuery(document).ready(function(){
<li op="account_message"><a href="$!webPath/buyer/account_message.htm">我的消息</a></li> <li op="account_message"><a href="$!webPath/buyer/account_message.htm">我的消息</a></li>
#end #end
<<<<<<< HEAD
<!-- <li op="zsh_buyer_cash"><a href="$!webPath/buyer/contract_list.htm">装修订单</a></li> --> <!-- <li op="zsh_buyer_cash"><a href="$!webPath/buyer/contract_list.htm">装修订单</a></li> -->
=======
<li op="zsh_buyer_cash"><a href="$!webPath/buyer/contract_list.htm">装修订单</a></li>
>>>>>>> ebfda64361cc95cb48601d7ac63431d56c46800e
</ul> </ul>
</li> </li>
</ul> </ul>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment