Fix merge conflicts with upstream

[akkoma] / test / pleroma / user_test.exs

diff --git a/test/pleroma/user_test.exs b/test/pleroma/user_test.exs
index abc471d13ffddf1faba6359d6133b5fb1b026110..f8777f0f751057ed3295afd0c1f8b8711e7a642c 100644 (file)
--- a/test/pleroma/user_test.exs
+++ b/test/pleroma/user_test.exs
@@ -1649,7 +1649,6 @@ defmodule Pleroma.UserTest do
         ap_enabled: true,
         is_moderator: true,
         is_admin: true,
-        mastofe_settings: %{"a" => "b"},
         mascot: %{"a" => "b"},
         emoji: %{"a" => "b"},
         pleroma_settings_store: %{"q" => "x"},
@@ -1691,7 +1690,6 @@ defmodule Pleroma.UserTest do
              ap_enabled: false,
              is_moderator: false,
              is_admin: false,
-             mastofe_settings: nil,
              mascot: nil,
              emoji: %{},
              pleroma_settings_store: %{},