From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 4 Apr 2019 17:29:10 +0000 (-0500)
Subject: Clean merge crumbs
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7222afe01b13586018b481172731309587191338;p=akkoma

Clean merge crumbs
---

diff --git a/config/config.exs b/config/config.exs
index ebaf1aec5..b19b36b22 100644
--- 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,