diff --git a/static/js/request.js b/static/js/request.js
index 03fc80e..c22e5da 100644
--- a/static/js/request.js
+++ b/static/js/request.js
@@ -2,10 +2,7 @@ import Vue from 'vue';
 import store from '@/store';
 
 // 定义 API URL
-<<<<<<< HEAD
-=======
 // const DEV_API_URL = 'https://api.cloud.sz-trip.com';
->>>>>>> f0f6523fe7690c25b235c63518b27786424d6afb
 const DEV_API_URL = 'https://swsz.api.js-dyyj.com';
 const PROD_API_URL = 'https://swsz.api.js-dyyj.com';
 const NEWAPIURL = process.env.NODE_ENV === 'development' ? DEV_API_URL : PROD_API_URL;