Clean merge crumbs

diff --git a/config/config.exs b/config/config.exs
index ebaf1aec577d46be14576e7daa68c1e2573adc0e..b19b36b2276e3907518a9209457839c78de6b599 100644 (file)
--- 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,