From 29291988d5f4c294949d6893dcb93b5a7a261c62 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 29 二月 2024 19:30:39 +0800
Subject: [PATCH] 1

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

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

--
Gitblit v1.9.1