Resolve config/sidekiq_queues.yml

dded33d6 · Lin Jen-Shin · 7b7b53a0 · dded33d6
Commit dded33d6 authored Mar 07, 2018 by Lin Jen-Shin
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
@@ -70,7 +70,6 @@
  - [pages_domain_verification, 1]
  - [plugin, 1]
  - [pipeline_background, 1]
-<<<<<<< HEAD

  # EE-specific queues
  - [ldap_group_sync, 2]
@@ -87,5 +86,3 @@
  - [export_csv, 1]
  - [object_storage_upload, 1]
  - [object_storage, 1]
-=======
->>>>>>> upstream/master