diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-04-04 12:29:10 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-04-04 12:29:10 -0500 |
| commit | 7222afe01b13586018b481172731309587191338 (patch) | |
| tree | a73ea127af73ef03b0c3b4f29147e1ec7f266def | |
| parent | 7e930559fece1a86891645333cc79a18f440ef1d (diff) | |
| download | pleroma-7222afe01b13586018b481172731309587191338.tar.gz | |
Clean merge crumbs
| -rw-r--r-- | config/config.exs | 1 |
1 files changed, 0 insertions, 1 deletions
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, |