Resolve conflicts in config/sidekiq_queues.yml

38266c5f · Stan Hu · b8f4e914 · 38266c5f
Commit 38266c5f authored Dec 08, 2018 by Stan Hu
Show 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
@@ -84,7 +84,6 @@
  - [object_pool, 1]
  - [repository_cleanup, 1]
  - [delete_stored_files, 1]
-<<<<<<< HEAD
  # EE-specific queues
  - [ldap_group_sync, 2]
@@ -106,5 +105,3 @@
  - geo_file_download
  - geo_project_sync
  - geo_repository_shard_sync
-=======
->>>>>>> upstream/master