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

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

diff --git a/pages/personalCenter/myCollection/index.wxml b/pages/personalCenter/myCollection/index.wxml
index 85d5124..24884c0 100644
--- a/pages/personalCenter/myCollection/index.wxml
+++ b/pages/personalCenter/myCollection/index.wxml
@@ -1 +1,6 @@
-<text>鎴戠殑鏀惰棌</text>
\ No newline at end of file
+<<<<<<< HEAD
+<text>鎴戠殑鏀惰棌</text>
+=======
+<!--pages/personalCenter/myCollection/index.wxml-->
+<text>pages/personalCenter/myCollection/index.wxml</text>
+>>>>>>> master

--
Gitblit v1.9.1