From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Thu, 31 Jan 2019 08:23:50 +0000 (+0700)
Subject: fix merge
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=58e250d9d27205116df5634d909ec1e43ea55286;p=akkoma

fix merge
---

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 @@ defmodule Pleroma.Application 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() ++