Clean merge crumbs

2019-04-04 12:29:10 -05:00 · 2019-04-04 12:29:10 -05:00 · 7222afe01b
commit 7222afe01b
parent 7e930559fe
1 changed files with 0 additions and 1 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -353,7 +353,6 @@ config :pleroma, Pleroma.Web.Federator.RetryQueue,
  initial_timeout: 30,
  max_retries: 5

-<<<<<<< HEAD
 config :pleroma_job_queue, :queues,
  federator_incoming: 50,
  federator_outgoing: 50,