Fixes conflicts on config/sidekiq_queues.yml

ca4d9620 · Mayra Cabrera · f7776b1d · ca4d9620
Commit ca4d9620 authored Sep 07, 2018 by Mayra Cabrera
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
@@ -79,7 +79,6 @@
  - [delete_diff_files, 1]
  - [detect_repository_languages, 1]
  - [auto_devops, 2]
-<<<<<<< HEAD

  # EE-specific queues
  - [ldap_group_sync, 2]
@@ -101,5 +100,3 @@
  - geo_file_download
  - geo_project_sync
  - geo_repository_shard_sync
-=======
->>>>>>> upstream/master