diff --git a/src/api/index.js b/src/api/index.js
index 0e47e846..9ec5f0bd 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -41,7 +41,6 @@ export const getDeleteShipjk = (params) => {
     })
 };
 //视频分析预览
-<<<<<<< HEAD
 // 分析配置接口
 export const getFeixpz = (params) => {
     return axios.get('aps/GetFeixpz', {
@@ -69,7 +68,6 @@ export const setFeixzbzh = (params) => {
 };
 
 
-=======
 //根据组件id获取单个组件信息
 export const getComponentData = (params) => {
     return axios.get('aps/GetMonqjkzjcsDetails', {
@@ -83,4 +81,3 @@ export const getSectionalData = (params) => {
     })
 };
 //
->>>>>>> 5849d1b4ed53eb7dc858a9ab7840f03758656d14
diff --git a/vue.config.js b/vue.config.js
index e849b9e0..1343fbd5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -33,11 +33,7 @@ module.exports = {
         // port: 8989, // 开发服务器运行端口号
         proxy: {
             '/aps': { //代理的名字
-<<<<<<< HEAD
                 target: 'http://172.16.1.168:5000/api/', 
-=======
-                target: 'http://172.16.1.253:5000/api/', 
->>>>>>> 5849d1b4ed53eb7dc858a9ab7840f03758656d14
                 // target: 'http://172.16.1.178:5001/',
                 // target: 'http://ht.api.umayle.com:2022', 
                 ws: true,