From 7582cac69aa799cc9cb331e905a326ccc4445002 Mon Sep 17 00:00:00 2001
From: tnt group <dodu@live.cn>
Date: Sun, 25 Sep 2022 22:10:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E6=97=B6=E9=81=97=E6=BC=8F=E7=9A=84=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mock/index.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/api/mock/index.ts b/src/api/mock/index.ts
index 8ec6ea42..f49791aa 100644
--- a/src/api/mock/index.ts
+++ b/src/api/mock/index.ts
@@ -76,17 +76,15 @@ const mockObject: MockMethod[] = [
     response: () => test.fetchScatterBasic
   },
   {
-<<<<<<< HEAD
     url: mapUrl,
     method: RequestHttpEnum.GET,
     response: () => test.fetchMap
   },
-=======
+  {
     url: wordCloudUrl,
     method: RequestHttpEnum.GET,
     response: () => test.fetchWordCloud
   }
->>>>>>> dev-wordcloud
 ]
 
 export default mockObject