Fix merge conflict

2019-06-05 17:55:00 +07:00 · 2019-06-05 17:55:00 +07:00 · ddd4a09b72
commit ddd4a09b72
parent cfa5572d28
1 changed files with 2 additions and 0 deletions
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@ -98,6 +98,8 @@ defmodule Pleroma.Web.CommonAPI.Utils do
    end
  end

+  def get_to_and_cc(_user, _mentions, _inReplyTo, _), do: {[], []}
+
  def get_addressed_users(_, to) when is_list(to) do
    User.get_ap_ids_by_nicknames(to)
  end