diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-14 20:19:08 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-14 20:19:08 +0300 |
| commit | f7e623c11c4b6f4f323a4317e9489092be73f9cd (patch) | |
| tree | e03ec6a306e4cf8eb894916904cfabf8381b8c47 /lib | |
| parent | 0cda80f266c03557b47112e52bfe748655b4321c (diff) | |
| download | pleroma-f7e623c11c4b6f4f323a4317e9489092be73f9cd.tar.gz | |
[#1364] Resolved merge conflicts with `develop`.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/notification.ex | 1 |
1 files changed, 0 insertions, 1 deletions
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 |