Fix conflict

[akkoma] / config / test.exs

diff --git a/config/test.exs b/config/test.exs
index 41cddb9bd8938b52b7d1f4c70e1fae552cb2b2a6..adb8742235d16f841de322749db12345503b713d 100644 (file)
--- a/config/test.exs
+++ b/config/test.exs
@@ -67,6 +67,8 @@ rum_enabled = System.get_env("RUM_ENABLED") == "true"
 config :pleroma, :database, rum_enabled: rum_enabled
 IO.puts("RUM enabled: #{rum_enabled}")
 
+config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp35v0RK9SO8WTPr6QZ"
+
 try do
   import_config "test.secret.exs"
 rescue