From b5d0ecfdf455d36b6b0901f6566b6bdaf8b69fee Mon Sep 17 00:00:00 2001
From: wuzhihao <wuzhihao@aiotagro.com>
Date: Fri, 30 Aug 2024 15:00:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=B7=AF=E7=94=B1=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 6c9d7a9..2ec5a90 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -7,7 +7,6 @@ import local from '../utils/local'
 Vue.use(VueRouter)
 
 const routes = [
-<<<<<<< HEAD
   {
     path: '/login',
     component: Login,
@@ -97,7 +96,6 @@ const routes = [
       },
     ]
   },
-=======
     {
         path: '/login',
         component: Login,
@@ -160,7 +158,6 @@ const routes = [
             }
         ]
     }
->>>>>>> d14b2f2f812d1e29c7e72c864828024a3008a9a6
 ]
 
 const router = new VueRouter({