pages/personalCenter/myCollection/index.wxml @@ -1 +1,6 @@ <text>我的收藏</text> <<<<<<< HEAD <text>我的收藏</text> ======= <!--pages/personalCenter/myCollection/index.wxml--> <text>pages/personalCenter/myCollection/index.wxml</text> >>>>>>> master
