diff options
| author | rinpatch <rinpatch@sdf.org> | 2018-12-01 18:12:27 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2018-12-01 18:12:27 +0300 |
| commit | fe2759bc9f2dad044b49f4954693ac09f9368041 (patch) | |
| tree | 59dd9c5026f433d976defa303de0d6782d435d1e /test/web/twitter_api/twitter_api_test.exs | |
| parent | ba6e3eba33f16bdd2fede086d5fb5c86201cb57b (diff) | |
| parent | 8c3ff06e35e11a40cf4eb35a41a2019b7496e62c (diff) | |
| download | pleroma-fe2759bc9f2dad044b49f4954693ac09f9368041.tar.gz pleroma-fe2759bc9f2dad044b49f4954693ac09f9368041.zip | |
Attempt to resolve merge conflict
Diffstat (limited to 'test/web/twitter_api/twitter_api_test.exs')
| -rw-r--r-- | test/web/twitter_api/twitter_api_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index 6486540f8..8b9920bd9 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -48,7 +48,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do "https://www.w3.org/ns/activitystreams#Public" ) - assert Enum.member?(get_in(activity.data, ["cc"]), "shp") + assert Enum.member?(get_in(activity.data, ["to"]), "shp") assert activity.local == true assert %{"moominmamma" => "http://localhost:4001/finmoji/128px/moominmamma-128.png"} = |