fix: 修复合并时遗漏的冲突

This commit is contained in:
tnt group
2022-09-25 22:10:42 +08:00
parent 790917eaf2
commit 7582cac69a
+1 -3
View File
@@ -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