Fix merge conflicts with upstream

[akkoma] / lib / pleroma / web / o_auth / o_auth_controller.ex

diff --git a/lib/pleroma/web/o_auth/o_auth_controller.ex b/lib/pleroma/web/o_auth/o_auth_controller.ex
index 42f4d768f0b3643d075a30844bcaca52168c167c..73d48549710fcf014e50cfc9008ef2738fa453fd 100644 (file)
--- a/lib/pleroma/web/o_auth/o_auth_controller.ex
+++ b/lib/pleroma/web/o_auth/o_auth_controller.ex
@@ -600,9 +600,12 @@ defmodule Pleroma.Web.OAuth.OAuthController do
     end
   end
 
+<<<<<<< HEAD
+=======
   # Special case: Local MastodonFE
   defp redirect_uri(%Plug.Conn{} = conn, "."), do: Routes.auth_url(conn, :login)
 
+>>>>>>> 0c56f9de0d607b88fd107e0bd13ef286f0629346
   defp redirect_uri(%Plug.Conn{}, redirect_uri), do: redirect_uri
 
   defp get_session_registration_id(%Plug.Conn{} = conn), do: get_session(conn, :registration_id)