From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Tue, 14 Apr 2020 17:19:08 +0000 (+0300)
Subject: [#1364] Resolved merge conflicts with `develop`.
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=f7e623c11c4b6f4f323a4317e9489092be73f9cd;p=akkoma

[#1364] Resolved merge conflicts with `develop`.
---

diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index f517282f7..b76dd176c 100644
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -7,7 +7,6 @@ defmodule Pleroma.Notification do
 
   alias Pleroma.Activity
   alias Pleroma.FollowingRelationship
-  alias Pleroma.Marker
   alias Pleroma.Notification
   alias Pleroma.Object
   alias Pleroma.Pagination