From 525dae0dec6ba6afbe6bf81b82eb99d69aeb05b5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 八月 2023 15:57:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes

---
 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