From 363ca0eb346d5fdb4121eef5da8351278eaf777f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Sat, 1 Feb 2020 13:08:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/.env.development | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/frontend/.env.development b/frontend/.env.development
index 8d7c68bc..ba21c0c6 100644
--- a/frontend/.env.development
+++ b/frontend/.env.development
@@ -1,7 +1,3 @@
 NODE_ENV='development'
-<<<<<<< Updated upstream
 VUE_APP_BASE_URL=http://localhost:8000
-VUE_APP_CRAWLAB_BASE_URL=https://api.crawlab.cn
-=======
-VUE_APP_BASE_URL=http://localhost:8001
->>>>>>> Stashed changes
+VUE_APP_CRAWLAB_BASE_URL=https://api.crawlab.cn
\ No newline at end of file