yee 8 years ago
parent
commit
a5b45fb67c
1 changed files with 0 additions and 4 deletions
  1. 0 4
      entry.js

+ 0 - 4
entry.js

@@ -17,12 +17,8 @@ module.exports = {
     //admin-servicesManage
     'admin/servicesManage/patent': './js/admin/servicesManage/patent.js',
     'admin/servicesManage/copyright': './js/admin/servicesManage/copyright.js',
-<<<<<<< HEAD
     'admin/servicesManage/highTech': './js/admin/servicesManage/highTech.js',
     'admin/servicesManage/technology': './js/admin/servicesManage/technology.js'
-=======
-    'admin/servicesManage/highTech': './js/admin/servicesManage/highTech.js'
->>>>>>> 8ef5b05a87b98526eca6dd95b920f31c23faf073
   },
   watch: {
     'user/index': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port