Clean merge crumbs

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,