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/myCollection/index.wxml |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/pages/personalCenter/myCollection/index.wxml b/pages/personalCenter/myCollection/index.wxml
index 24884c0..85d5124 100644
--- a/pages/personalCenter/myCollection/index.wxml
+++ b/pages/personalCenter/myCollection/index.wxml
@@ -1,6 +1 @@
-<<<<<<< HEAD
-<text>鎴戠殑鏀惰棌</text>
-=======
-<!--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