From 0c4507ad5ebdbf8ac1c2bbcdcf38203908e61378 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 21 八月 2023 16:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/screen_standard/src/App.vue b/screen_standard/src/App.vue
index 9799296..043ed5b 100644
--- a/screen_standard/src/App.vue
+++ b/screen_standard/src/App.vue
@@ -5,10 +5,6 @@
 
 <template>
   <AppLayout />
-<<<<<<< HEAD
-  
-=======
->>>>>>> 5103535bcd7b012c0eda4cbb26968066b35704d1
 </template>
 
 <style scoped>

--
Gitblit v1.9.3