Clean merge crumbs
This commit is contained in:
parent
7e930559fe
commit
7222afe01b
|
@ -353,7 +353,6 @@
|
|||
initial_timeout: 30,
|
||||
max_retries: 5
|
||||
|
||||
<<<<<<< HEAD
|
||||
config :pleroma_job_queue, :queues,
|
||||
federator_incoming: 50,
|
||||
federator_outgoing: 50,
|
||||
|
|
Loading…
Reference in a new issue