From 918b9b60f128c4945a0a9f8f46693ec4e3b38bd8 Mon Sep 17 00:00:00 2001
From: songjingcheng <songjingcheng@geedgenetworks.com>
Date: Fri, 30 Apr 2021 14:40:56 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-593=20header=20link=20=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/layout/header.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue
index f58206cd7..3fa317520 100644
--- a/nezha-fronted/src/components/layout/header.vue
+++ b/nezha-fronted/src/components/layout/header.vue
@@ -133,17 +133,11 @@ export default {
       })
     },
     getLinkData () {
-<<<<<<< HEAD
       this.$get('link').then(response => {
         this.$store.commit('setLinkData', response.data.list)
         // this.linkData = response.data.list
         // console.log(this.linkData);
       }) 
-=======
-      this.$get('link').then(response =>{
-        this.$store.commit('setLinkData',response.data.list)
-      })
->>>>>>> 0f37c1d20484cd184721b1c759597e853126b275
     },
     changeLocal (lang) {
       if (lang != localStorage.getItem('nz-language')) {