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.js |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/pages/teacherCertification/index.js b/pages/teacherCertification/index.js
index 71dd20a..cd7b7c1 100644
--- a/pages/teacherCertification/index.js
+++ b/pages/teacherCertification/index.js
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-// pages/bookServices/index.js
-=======
-// pages/teacherCertification/index.js
->>>>>>> master
 Page({
 
   /**

--
Gitblit v1.9.1