From 8d0ae8ae8a29fc6f1ed8b929f3e97f37710eff70 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 05 三月 2024 19:18:51 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

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

diff --git a/pages/personalCenter/index.wxml b/pages/personalCenter/index.wxml
index 479337b..4e3b370 100644
--- a/pages/personalCenter/index.wxml
+++ b/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>
\ No newline at end of file

--
Gitblit v1.9.1