From 58e250d9d27205116df5634d909ec1e43ea55286 Mon Sep 17 00:00:00 2001
From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Thu, 31 Jan 2019 15:23:50 +0700
Subject: [PATCH] fix merge

---
 lib/pleroma/application.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index e81816e35..e44c48c35 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -109,7 +109,7 @@ def start(_type, _args) do
           worker(Pleroma.Stats, []),
           worker(Pleroma.Web.Push, []),
           worker(Pleroma.Jobs, []),
-          worker(Task, [&Pleroma.Web.Federator.init/0], restart: :temporary)          
+          worker(Task, [&Pleroma.Web.Federator.init/0], restart: :temporary)
         ] ++
         streamer_child() ++
         chat_child() ++