Resolve conflicts in app/workers/all_queues.yml

d53dae69 · Stan Hu · 7d51283f · d53dae69
Commit d53dae69 authored Jun 25, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/workers/all_queues.yml app/workers/all_queues.yml +0 -3

No files found.
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -119,7 +119,6 @@
 - repository_update_remote_mirror
 - create_note_diff_file
 - delete_diff_files
-<<<<<<< HEAD
 # EE-specific queues
@@ -182,5 +181,3 @@
 - rebase
 - repository_update_mirror
 - chat_notification
-=======
->>>>>>> upstream/master