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