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

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

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

--
Gitblit v1.9.1