Commit 2c282e7b authored by noyuno's avatar noyuno

Remove git conflict marker

parent 0a85891d
Pipeline #2644 failed with stages
in 1 minute and 54 seconds
......@@ -474,11 +474,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|> restrict_recent(opts)
|> restrict_blocked(opts)
|> restrict_media(opts)
<<<<<<< HEAD
=======
|> restrict_visibility(opts)
|> restrict_replies(opts)
>>>>>>> upstream/develop
end
def fetch_activities(recipients, opts \\ %{}) do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment