From 366de5b4636679392a1e3d2984fc23bd5eaa5ac3 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 27 八月 2024 17:48:03 +0800
Subject: [PATCH] wenti

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

diff --git a/pages/personalCenter/certificate/index.wxml b/pages/personalCenter/certificate/index.wxml
index a5dcc42..715d10c 100644
--- a/pages/personalCenter/certificate/index.wxml
+++ b/pages/personalCenter/certificate/index.wxml
@@ -1,11 +1,2 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
 <!--pages/personalCenter/certificate/index.wxml-->
-<text>pages/personalCenter/certificate/index.wxml</text>
->>>>>>> master
-=======
-<!--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