From 80232d691dd9c4989985b570ce4d745e5d2bc3f7 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期三, 20 三月 2024 18:34:19 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

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

diff --git a/pages/personalCenter/certificate/index.wxml b/pages/personalCenter/certificate/index.wxml
index 45592f3..715d10c 100644
--- a/pages/personalCenter/certificate/index.wxml
+++ b/pages/personalCenter/certificate/index.wxml
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-
-=======
 <!--pages/personalCenter/certificate/index.wxml-->
-<text>pages/personalCenter/certificate/index.wxml</text>
->>>>>>> master
+<text>pages/personalCenter/certificate/index.wxml</text>
\ No newline at end of file

--
Gitblit v1.9.1