From 60bae3bf527b15fc5aefd555d7c76916b012b823 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 29 二月 2024 18:45:02 +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 e1c47c7..71dd20a 100644
--- a/pages/teacherCertification/index.js
+++ b/pages/teacherCertification/index.js
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
// pages/bookServices/index.js
+=======
+// pages/teacherCertification/index.js
+>>>>>>> master
Page({
/**
--
Gitblit v1.9.1