Resolve merge conflicts

[akkoma] / config / test.exs

diff --git a/config/test.exs b/config/test.exs
index 92dca18bc166e746e28ea40965b1559c6e88e867..aded8600d169b580d47ad9a571bba923f0dac50d 100644 (file)
--- a/config/test.exs
+++ b/config/test.exs
@@ -29,7 +29,8 @@ config :pleroma, :instance,
   email: "admin@example.com",
   notify_email: "noreply@example.com",
   skip_thread_containment: false,
-  federating: false
+  federating: false,
+  external_user_synchronization: false
 
 config :pleroma, :activitypub, sign_object_fetches: false