From 60bae3bf527b15fc5aefd555d7c76916b012b823 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 29 二月 2024 18:45:02 +0800
Subject: [PATCH] 冲突解决

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

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

--
Gitblit v1.9.1