From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Wed, 5 Jun 2019 10:55:00 +0000 (+0700)
Subject: Fix merge conflict
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ddd4a09b72ede65345ddf45a68eb239b54eda86c;p=akkoma

Fix merge conflict
---

diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 22ce1ea90..6c9e117ae 100644
--- 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