Skip to content
Snippets Groups Projects
Commit efc3de24 authored by Thijs Kinkhorst's avatar Thijs Kinkhorst
Browse files

Fix merge error

parent 967ec292
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
modules/saml/lib/Message.php
+ 0
− 1
View file @ efc3de24
...@@ -478,7 +478,6 @@ class Message ...@@ -478,7 +478,6 @@ class Message
$nameIdPolicy = $spMetadata->getValue('NameIDPolicy'); $nameIdPolicy = $spMetadata->getValue('NameIDPolicy');
} }
<<<<<<< HEAD
$policy = \SimpleSAML\Utils\Config\Metadata::parseNameIdPolicy($nameIdPolicy); $policy = \SimpleSAML\Utils\Config\Metadata::parseNameIdPolicy($nameIdPolicy);
if ($policy !== null) { if ($policy !== null) {
// either we have a policy set, or we used the transient default // either we have a policy set, or we used the transient default
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment