Resolve conflicts in config/sidekiq_queues.yml

cbf9b7ce · Stan Hu · f4bd14c0 · cbf9b7ce
Commit cbf9b7ce authored Mar 01, 2018 by Stan Hu
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
@@ -69,7 +69,6 @@
  - [storage_migrator, 1]
  - [pages_domain_verification, 1]
  - [plugin, 1]
-<<<<<<< HEAD

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