Resolve conflicts in config/sidekiq_queues.yml

2e90dc76 · Stan Hu · 61b3bbbc · 2e90dc76
Commit 2e90dc76 authored Jul 19, 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
@@ -76,7 +76,6 @@
  - [repository_remove_remote, 1]
  - [create_note_diff_file, 1]
  - [delete_diff_files, 1]
-<<<<<<< HEAD
  # EE-specific queues
  - [ldap_group_sync, 2]
@@ -97,5 +96,3 @@
  - geo_file_download
  - geo_project_sync
  - geo_repository_shard_sync
-=======
->>>>>>> upstream/master