From e4be5ba9eea9fe8408f3a7048a315b3767b33f49 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 23 二月 2024 09:54:38 +0800
Subject: [PATCH] mrshi
---
platform/src/layouts/AppLayout.vue | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/platform/src/layouts/AppLayout.vue b/platform/src/layouts/AppLayout.vue
index 96464f1..f073fc6 100644
--- a/platform/src/layouts/AppLayout.vue
+++ b/platform/src/layouts/AppLayout.vue
@@ -13,15 +13,9 @@
<div style="height:10px;"></div>
<main>
<transition name="fade">
-<<<<<<< HEAD
<!-- <keep-alive>-->
<router-view></router-view>
<!-- </keep-alive>-->
-=======
- <keep-alive>
- <router-view></router-view>
- </keep-alive>
->>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
</transition>
</main>
</el-main>
--
Gitblit v1.9.3