From ef35deb727190363d17d693d10f27171787cc92c Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 3 Feb 2014 15:38:24 +0100
Subject: Solve some merge problems

---
 id/oa/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/oa/pom.xml')

diff --git a/id/oa/pom.xml b/id/oa/pom.xml
index c5664c281..621c428bd 100644
--- a/id/oa/pom.xml
+++ b/id/oa/pom.xml
@@ -46,7 +46,7 @@
 			<dependency>
   			<groupId>org.opensaml</groupId>
   			<artifactId>opensaml</artifactId>
-  			<version>2.5.3</version>
+  			<version>2.6.0</version>
   		</dependency>  		
 			<dependency>
 				<groupId>org.opensaml</groupId>
-- 
cgit v1.2.3