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

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

diff --git a/pages/personalCenter/certificate/index.wxml b/pages/personalCenter/certificate/index.wxml
index 8b13789..45592f3 100644
--- a/pages/personalCenter/certificate/index.wxml
+++ b/pages/personalCenter/certificate/index.wxml
@@ -1 +1,6 @@
+<<<<<<< HEAD
 
+=======
+<!--pages/personalCenter/certificate/index.wxml-->
+<text>pages/personalCenter/certificate/index.wxml</text>
+>>>>>>> master

--
Gitblit v1.9.1