2.2.1
authorTamas Frank <sitya@niif.hu>
Thu, 19 May 2011 18:21:25 +0000 (20:21 +0200)
committerTamas Frank <sitya@niif.hu>
Thu, 19 May 2011 18:21:25 +0000 (20:21 +0200)
pom.xml

diff --git a/pom.xml b/pom.xml
index b23c355..d0cba35 100644 (file)
--- a/pom.xml
+++ b/pom.xml
         <dependency>
             <groupId>edu.internet2.middleware</groupId>
             <artifactId>shibboleth-common</artifactId>
-<<<<<<< HEAD
-            <version>1.2.0-slo2</version>
-=======
-            <version>1.2.1</version>
->>>>>>> master
+            <version>1.2.1-slo2</version>
         </dependency>
         
         <!-- Provided dependencies -->