projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[#1364] Resolved merge conflicts with `develop`.
[akkoma]
/
lib
/
pleroma
/
notification.ex
diff --git
a/lib/pleroma/notification.ex
b/lib/pleroma/notification.ex
index f517282f7c030928513e3ce87c1bd5af59b23938..b76dd176c0be6c5b9bfe9121f6f79ce694d67b7b 100644
(file)
--- 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