modified version
authorTamas Frank <sitya@niif.hu>
Mon, 25 Jul 2011 17:05:28 +0000 (19:05 +0200)
committerTamas Frank <sitya@niif.hu>
Mon, 25 Jul 2011 17:05:28 +0000 (19:05 +0200)
pom.xml

diff --git a/pom.xml b/pom.xml
index 97b212d..b60407c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
         <dependency>
             <groupId>edu.internet2.middleware</groupId>
             <artifactId>shibboleth-common</artifactId>
-<<<<<<< HEAD
-            <version>1.3.0-slo2</version>
-=======
-            <version>1.3.2</version>
->>>>>>> master
+            <version>1.3.2-slo2</version>
         </dependency>
 
         <!-- Provided dependencies -->