Resolve conflicts in config/sidekiq_queues.yml

9a208719 · Ash McKenzie · e2dc0700 · 9a208719
Commit 9a208719 authored May 08, 2018 by Ash McKenzie
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

No files found.
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -75,7 +75,6 @@
  - [pipeline_background, 1]
  - [repository_update_remote_mirror, 1]
  - [repository_remove_remote, 1]
-<<<<<<< HEAD
  # EE-specific queues
  - [ldap_group_sync, 2]
@@ -96,6 +95,3 @@
  - geo_file_download
  - geo_project_sync
  - geo_repository_shard_sync
-=======
->>>>>>> upstream/master