From 1692fa89458f0f83f69ffa2f85a998869b8fe454 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Aug 2019 17:22:26 +0200
Subject: [PATCH] ActivityExpirationWorker: Fix merge issues.

---
 lib/pleroma/activity_expiration_worker.ex | 2 +-
 lib/pleroma/application.ex                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/activity_expiration_worker.ex b/lib/pleroma/activity_expiration_worker.ex
index a341f58df..0f9e715f8 100644
--- a/lib/pleroma/activity_expiration_worker.ex
+++ b/lib/pleroma/activity_expiration_worker.ex
@@ -15,7 +15,7 @@ defmodule Pleroma.ActivityExpirationWorker do
 
   @schedule_interval :timer.minutes(1)
 
-  def start_link do
+  def start_link(_) do
     GenServer.start_link(__MODULE__, nil)
   end
 
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 1e4de272c..483ac1f39 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -36,7 +36,7 @@ def start(_type, _args) do
         Pleroma.Captcha,
         Pleroma.FlakeId,
         Pleroma.ScheduledActivityWorker,
-        Pleroma.ActiviyExpirationWorker
+        Pleroma.ActivityExpirationWorker
       ] ++
         cachex_children() ++
         hackney_pool_children() ++