merge conflicts
authorTamas Frank <sitya@niif.hu>
Thu, 19 May 2011 18:41:20 +0000 (20:41 +0200)
committerTamas Frank <sitya@niif.hu>
Thu, 19 May 2011 18:41:20 +0000 (20:41 +0200)
pom.xml
src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerNamespaceHandler.java

diff --git a/pom.xml b/pom.xml
index 263785a..db02e74 100644 (file)
--- a/pom.xml
+++ b/pom.xml
         <dependency>
             <groupId>edu.internet2.middleware</groupId>
             <artifactId>shibboleth-common</artifactId>
-<<<<<<< HEAD
-            <version>1.2.1-slo2</version>
-=======
             <version>1.3.0</version>
->>>>>>> master
         </dependency>
 
         <!-- Provided dependencies -->
             <timezone>0</timezone>
         </developer>
     </developers>
-<<<<<<< HEAD
-    
 </project>
-=======
-
-</project>
->>>>>>> tags/2.3.0
index 5337b29..a5159f9 100644 (file)
@@ -75,13 +75,10 @@ public class ProfileHandlerNamespaceHandler extends BaseSpringNamespaceHandler {
         registerBeanDefinitionParser(SAML2SSOProfileHandlerBeanDefinitionParser.SCHEMA_TYPE,
                 new SAML2SSOProfileHandlerBeanDefinitionParser());
 
-<<<<<<< HEAD
         registerBeanDefinitionParser(SAML2SLOProfileHandlerBeanDefinitionParser.SCHEMA_TYPE,
                 new SAML2SLOProfileHandlerBeanDefinitionParser());
-=======
         registerBeanDefinitionParser(SAML2ECPProfileHandlerBeanDefinitionParser.SCHEMA_TYPE,
                 new SAML2ECPProfileHandlerBeanDefinitionParser());
->>>>>>> master
 
         registerBeanDefinitionParser(SAML2AttributeQueryProfileHandlerBeanDefinitionParser.SCHEMA_TYPE,
                 new SAML2AttributeQueryProfileHandlerBeanDefinitionParser());