pages/personalCenter/index.wxml
@@ -1,5 +1,3 @@ <<<<<<< HEAD <<<<<<< HEAD <view class="background {{ isWhite ? 'white':''}}"> <text class="text">个人中心</text> </view> @@ -69,12 +67,4 @@ </view> </view> </view> </view> ======= <!--pages/personalCenter/index.wxml--> <text>pages/personalCenter/index.wxml</text> >>>>>>> master ======= <!--pages/personalCenter/index.wxml--> <text>pages/personalCenter/index.wxml</text> >>>>>>> master </view>
