From 358b9908802e21d74302fe31c2981f68e39b632e Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期四, 24 四月 2025 17:07:46 +0800
Subject: [PATCH] hebing

---
 src/App.vue |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 69690a8..12e4e5d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -29,12 +29,9 @@
     <policiesAndRegulations v-if="activeBook.name == 'policiesAndRegulations'"></policiesAndRegulations> 
     <OralAndBroadcasting v-if="activeBook.name == 'OralAndBroadcasting'" ></OralAndBroadcasting>
     <practicalCareChildrenManual v-if="activeBook.name == 'practicalCareChildrenManual'"></practicalCareChildrenManual>
-<<<<<<< HEAD
     <childIllnessPreventionCare v-if="activeBook.name == 'childIllnessPreventionCare'"></childIllnessPreventionCare>
-=======
     <artInitiationForAges0to3 v-if="activeBook.name == 'artInitiationForAges0to3'"></artInitiationForAges0to3>
     <toddlerSportsSafetyProtection v-if="activeBook.name == 'toddlerSportsSafetyProtection'"></toddlerSportsSafetyProtection>
->>>>>>> 92b4aea88467686de1009e822ba9310fb8553634
   </div>
 </template>
 <script>
@@ -87,12 +84,9 @@
     policiesAndRegulations: ()=> import("./books/policiesAndRegulations/view/index.vue"),
     OralAndBroadcasting:()=> import("./books/OralAndBroadcasting/view/index.vue"),
     practicalCareChildrenManual: ()=> import("./books/practicalCareChildrenManual/view/index.vue"),
-<<<<<<< HEAD
     childIllnessPreventionCare: ()=> import("./books/childIllnessPreventionCare/view/index.vue")
-=======
     artInitiationForAges0to3: ()=> import("./books/artInitiationForAges0to3/view/index.vue"),
     toddlerSportsSafetyProtection : ()=> import("./books/toddlerSportsSafetyProtection/view/index.vue"),
->>>>>>> 92b4aea88467686de1009e822ba9310fb8553634
   },
   data() {
     return {

--
Gitblit v1.9.1