From a53b466bf1a5bc9318df263d171b3d2a047bf60a Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Mon, 21 Aug 2023 13:51:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/abnormalAlarm/emailMonitor/overview/index.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/views/abnormalAlarm/emailMonitor/overview/index.vue b/src/views/abnormalAlarm/emailMonitor/overview/index.vue
index 9ae3205..d0dcf62 100644
--- a/src/views/abnormalAlarm/emailMonitor/overview/index.vue
+++ b/src/views/abnormalAlarm/emailMonitor/overview/index.vue
@@ -205,18 +205,12 @@ const columns = [
       customRender: 'status'
     }
   },{
-<<<<<<< Updated upstream
     title: 'ENABLE',
     align: 'left',
     dataIndex: 'enabled',
     scopedSlots: {
       customRender: 'enabled'
     }
-=======
-    title: 'ENABLE OR NOT',
-    align: 'center',
-    dataIndex: 'enabled'
->>>>>>> Stashed changes
   },{
     title: 'E-MAIL',
     align: 'center',