diff options
| author | Roland Hedberg <roland.hedberg@adm.umu.se> | 2012-05-28 21:57:35 +0200 |
|---|---|---|
| committer | Roland Hedberg <roland.hedberg@adm.umu.se> | 2012-05-28 21:57:35 +0200 |
| commit | c616d30da30507696414c0fca5f88d2fa89d4323 (patch) | |
| tree | c8aec9809d4e9c9341563528ec014bed75a0ff09 /src/saml2/attribute_resolver.py | |
| parent | 86320909488e67780b9fd5fe661204b61c447d08 (diff) | |
| download | pysaml2-c616d30da30507696414c0fca5f88d2fa89d4323.tar.gz | |
Fixed conflicts -missed some, fixed now
Diffstat (limited to 'src/saml2/attribute_resolver.py')
| -rw-r--r-- | src/saml2/attribute_resolver.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/saml2/attribute_resolver.py b/src/saml2/attribute_resolver.py index 39d205eb..f6d07334 100644 --- a/src/saml2/attribute_resolver.py +++ b/src/saml2/attribute_resolver.py @@ -67,8 +67,4 @@ class AttributeResolver(object): log=log, real_id=real_id) if session_info: result.append(session_info) -<<<<<<< HEAD return result -======= - return result ->>>>>>> eb53c062d261de66e86d8a6e2bbdfd7c17a753d5 |