From 7ebd4cebbdec2173fba7345285c0ed6d62043995 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 29 二月 2024 19:27:33 +0800
Subject: [PATCH] 冲突

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

diff --git a/pages/personalCenter/certificate/index.wxml b/pages/personalCenter/certificate/index.wxml
index 8b13789..a5dcc42 100644
--- a/pages/personalCenter/certificate/index.wxml
+++ b/pages/personalCenter/certificate/index.wxml
@@ -1 +1,11 @@
+<<<<<<< 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

--
Gitblit v1.9.1