From efc3de243578529633a00edfbe921c6006e8154f Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Tue, 13 Nov 2018 18:30:07 +0000
Subject: [PATCH] Fix merge error
---
modules/saml/lib/Message.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/modules/saml/lib/Message.php b/modules/saml/lib/Message.php
index bae836983..7c1d5be68 100644
--- a/modules/saml/lib/Message.php
+++ b/modules/saml/lib/Message.php
@@ -478,7 +478,6 @@ class Message
$nameIdPolicy = $spMetadata->getValue('NameIDPolicy');
}
-<<<<<<< HEAD
$policy = \SimpleSAML\Utils\Config\Metadata::parseNameIdPolicy($nameIdPolicy);
if ($policy !== null) {
// either we have a policy set, or we used the transient default
--
GitLab