From 0d1323fb39db5e8d3b124e61303bde1b1352b887 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 29 二月 2024 21:48:02 +0800
Subject: [PATCH] feat(daima代码合并): 和宁

---
 pages/personalCenter/index.wxml |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/pages/personalCenter/index.wxml b/pages/personalCenter/index.wxml
index 8af8bde..4e3b370 100644
--- a/pages/personalCenter/index.wxml
+++ b/pages/personalCenter/index.wxml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <view class="background {{ isWhite ? 'white':''}}">
   <text class="text">涓汉涓績</text>
 </view>
@@ -68,8 +67,4 @@
       </view>
     </view>
   </view>
-</view>
-=======
-<!--pages/personalCenter/index.wxml-->
-<text>pages/personalCenter/index.wxml</text>
->>>>>>> master
+</view>
\ No newline at end of file

--
Gitblit v1.9.1