squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean merge crumbs

Browse Source
This commit is contained in:
Mark Felder 2019-04-04 12:29:10 -05:00
parent 7e930559fe
commit 7222afe01b
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/config.exs
View File

@ -353,7 +353,6 @@ config :pleroma, Pleroma.Web.Federator.RetryQueue,
initial_timeout: 30, initial_timeout: 30,
max_retries: 5 max_retries: 5
<<<<<<< HEAD
config :pleroma_job_queue, :queues, config :pleroma_job_queue, :queues,
federator_incoming: 50, federator_incoming: 50,
federator_outgoing: 50, federator_outgoing: 50,