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

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

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

--
Gitblit v1.9.1