From ef35deb727190363d17d693d10f27171787cc92c Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 3 Feb 2014 15:38:24 +0100 Subject: Solve some merge problems --- id/server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'id/server/pom.xml') diff --git a/id/server/pom.xml b/id/server/pom.xml index bc664e890..056accdad 100644 --- a/id/server/pom.xml +++ b/id/server/pom.xml @@ -17,8 +17,8 @@ idserverlib proxy auth - stork-saml-engine moa-id-commons + stork2-saml-engine -- cgit v1.2.3