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

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

diff --git a/pages/teacherCertification/index.wxml b/pages/teacherCertification/index.wxml
index 9373670..ecc0fec 100644
--- a/pages/teacherCertification/index.wxml
+++ b/pages/teacherCertification/index.wxml
@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 <view class="container">
   <view class="tips">
     浠呴檺瀛︽牎鏈绋嬩换璇炬暀甯堢敵璇凤紱璇蜂笂浼犳湁鏁堝湪鑱屾暀甯堝伐浣滆瘉灏嗘湁鍔╀簬瀹℃牳銆�
@@ -95,3 +96,7 @@
 <!--pages/teacherCertification/index.wxml-->
 <text>pages/teacherCertification/index.wxml</text>
 >>>>>>> master
+=======
+<!--pages/teacherCertification/index.wxml-->
+<text>pages/teacherCertification/index.wxml</text>
+>>>>>>> master

--
Gitblit v1.9.1