From f7e623c11c4b6f4f323a4317e9489092be73f9cd Mon Sep 17 00:00:00 2001
From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Tue, 14 Apr 2020 20:19:08 +0300
Subject: [PATCH] [#1364] Resolved merge conflicts with `develop`.

---
 lib/pleroma/notification.ex | 1 -
 1 file changed, 1 deletion(-)

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
-- 
2.45.2