Merge remote branch 'tags/2.3.3' v2.3.3 v2.3.3-slo10
authorTamas Frank <sitya@niif.hu>
Thu, 20 Oct 2011 18:04:52 +0000 (20:04 +0200)
committerTamas Frank <sitya@niif.hu>
Thu, 20 Oct 2011 18:04:52 +0000 (20:04 +0200)
Conflicts:
pom.xml

1  2 
pom.xml

diff --cc pom.xml
+++ b/pom.xml
@@@ -3,9 -3,10 +3,9 @@@
           xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
           
      <modelVersion>4.0.0</modelVersion>
 -
      <groupId>edu.internet2.middleware</groupId>
      <artifactId>shibboleth-identityprovider</artifactId>
-     <version>2.3.2-slo10</version>
+     <version>2.3.3</version>
  
      <!-- We bundle as a jar here, the installer creates the WAR -->
      <packaging>jar</packaging>
              <timezone>0</timezone>
          </developer>
      </developers>
 -
  </project>
- <<<<<<< HEAD
- =======
- <<<<<<< HEAD
- >>>>>>> tags/2.3.0
- =======
- >>>>>>> tags/2.3.2
- >>>>>>> master