From 29291988d5f4c294949d6893dcb93b5a7a261c62 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 29 二月 2024 19:30:39 +0800
Subject: [PATCH] 1

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

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

--
Gitblit v1.9.1