diff --git a/src/api/index.js b/src/api/index.js
index cc2ac5b..5454bc1 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -25,11 +25,8 @@ import gzDict from './gzaiBox/dict'
 import plan from './plan/index'
 import periodical from './periodical/index'
 import engin from './engin'
-<<<<<<< .mine
 import tower from './device/tower/index'
-=======
 import quality from './quality'
->>>>>>> .theirs
 import {axios,download} from '@/utils/request'
 export default {
     project,
@@ -60,11 +57,7 @@ export default {
     downFile:download,
     engin,
     gzAiBoxVideo,
-<<<<<<< .mine
-    gzDict,
-    tower
-=======
     gzDict,
+    tower,
     quality
->>>>>>> .theirs
 }
\ No newline at end of file