From 5662a2d1f1fb7445e2e7d78aac6c0789ee42c954 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Mon, 11 Mar 2024 15:09:33 +0100
Subject: [PATCH] chore: fix merge oopsie contd

---
 src/Settings.hs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/Settings.hs b/src/Settings.hs
index 1894d0f03..1762c46fd 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -626,7 +626,6 @@ instance FromJSON AppSettings where
         appWebpackEntrypoints     <- o .: "webpack-manifest"
         appDatabaseConf           <- o .: "database"
         appAutoDbMigrate          <- o .: "auto-db-migrate"
-<<<<<<< HEAD
         -- TODO: reintroduce non-emptyness check for ldap hosts
         -- let nonEmptyHost (UserDbLdap LdapConf{..}) = case ldapHost of
         --       Ldap.Tls host _ -> not $ null host
@@ -635,13 +634,7 @@ instance FromJSON AppSettings where
         appUserAuthConf           <- o .: "user-auth"
         -- P.fromList . mapMaybe (assertM nonEmptyHost) <$> o .:? "user-database" .!= []
         appLdapPoolConf           <- o .:? "ldap-pool"
-=======
         appSingleSignOn           <- o .: "single-sign-on"
-        let nonEmptyHost LdapConf{..} = case ldapHost of
-              Ldap.Tls host _ -> not $ null host
-              Ldap.Plain host -> not $ null host
-        appLdapConf               <- P.fromList . mapMaybe (assertM nonEmptyHost) <$> o .:? "ldap" .!= []
->>>>>>> 139-single-sign-on-sso-routing-anpassen
         appLmsConf                <- o .: "lms-direct"
         appAvsConf                <- assertM (not . null . avsPass)  <$> o .:? "avs"
         appLprConf                <- o .: "lpr"