From 7f71a8a0197580e9dc8938600bf410dd867c76ac Mon Sep 17 00:00:00 2001 From: Serghei Mihai Date: Thu, 17 Sep 2015 13:10:30 +0200 Subject: [PATCH] clean git rebase marks --- src/authentic2/saml/management/commands/sync-metadata.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/authentic2/saml/management/commands/sync-metadata.py b/src/authentic2/saml/management/commands/sync-metadata.py index 06d972d..243599a 100644 --- a/src/authentic2/saml/management/commands/sync-metadata.py +++ b/src/authentic2/saml/management/commands/sync-metadata.py @@ -82,7 +82,6 @@ def check_support_saml2(tree): return True return False -<<<<<<< HEAD def text_child(tree, tag, default=''): elt = tree.find(tag) return elt.text if not elt is None else default -- 2.5.1