Update webpack.config.js

config/webpack.config.js

@@ -83,11 +83,6 @@ function generateEntries() {
     issues:               'ee/issues/issues_bundle.js',
     ldap_group_links:     'ee/groups/ldap_group_links.js',
     mirrors:              'ee/mirrors',
-<<<<<<< config/webpack.config.js
-    ee_protected_tags:    'ee/protected_tags',
-=======
-    ee_protected_branches: 'ee/protected_branches',
->>>>>>> config/webpack.config.js
     service_desk:         'ee/projects/settings_service_desk/service_desk_bundle.js',
     service_desk_issues:  'ee/service_desk_issues/index.js',
     roadmap:              'ee/roadmap',