Resolve config/sidekiq_queues.yml

ffb7d267 · Robert Speicher · 43b9293b · ffb7d267
Commit ffb7d267 authored Dec 06, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

config/sidekiq_queues.yml config/sidekiq_queues.yml +0 -3

No files found.
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -82,7 +82,6 @@
  - [detect_repository_languages, 1]
  - [auto_devops, 2]
  - [repository_cleanup, 1]
-<<<<<<< HEAD
  # EE-specific queues
  - [ldap_group_sync, 2]
@@ -104,5 +103,3 @@
  - geo_file_download
  - geo_project_sync
  - geo_repository_shard_sync
-=======
->>>>>>> upstream/master