Resolve conflicts

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index e337f00aaa02a65d46d73b21741db7bfb6f3bfdd..cb3ee531ccd3c84597aab04f5fba74906db8bb48 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -498,6 +498,14 @@ config :pleroma, Pleroma.ScheduledActivity,
   total_user_limit: 300,
   enabled: true
 
+config :pleroma, :email_notifications,
+  digest: %{
+    active: false,
+    schedule: "0 0 * * 0",
+    interval: 7,
+    inactivity_threshold: 7
+  }
+
 config :pleroma, :oauth2,
   token_expires_in: 600,
   issue_new_refresh_token: true,