Remove conflicts created by repository languages

Resolved conflicts:
- app/workers/all_queues.yml
- config/sidekiq_queues.yml
- spec/lib/gitlab/import_export/all_models.yml

CE MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19480
EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6611

app/workers/all_queues.yml

@@ -126,7 +126,6 @@
 - create_note_diff_file
 - delete_diff_files
 - detect_repository_languages
-<<<<<<< HEAD
 
 # EE-specific queues
 
@@ -185,5 +184,3 @@
 - rebase
 - repository_update_mirror
 - chat_notification
-=======
->>>>>>> upstream/master

config/sidekiq_queues.yml

@@ -78,7 +78,6 @@
   - [create_note_diff_file, 1]
   - [delete_diff_files, 1]
   - [detect_repository_languages, 1]
-<<<<<<< HEAD
 
   # EE-specific queues
   - [ldap_group_sync, 2]
@@ -99,5 +98,3 @@
   - geo_file_download
   - geo_project_sync
   - geo_repository_shard_sync
-=======
->>>>>>> upstream/master

spec/lib/gitlab/import_export/all_models.yml

@@ -334,12 +334,9 @@ project:
 - settings
 - ci_cd_settings
 - import_export_upload
-<<<<<<< HEAD
 - vulnerability_feedback
 - prometheus_alerts
 - software_license_policies
-=======
->>>>>>> upstream/master
 - repository_languages
 award_emoji:
 - awardable