From ae5214a3fdafeb1a859287f96f657783187e57d6 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Wed, 15 Jan 2014 15:19:15 +0100
Subject: fixed merge issue

---
 id/server/moa-id-commons/pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 94726fa16..c3e850b11 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -62,7 +62,11 @@
 			<artifactId>hyperjaxb3-ejb-runtime</artifactId>
 			<version>0.5.6</version>
 		</dependency>
-		
+		<dependency>
+	<groupId>org.jvnet.hyperjaxb3</groupId>
+	<artifactId>maven-hyperjaxb3-plugin</artifactId>
+	<version>0.5.6</version>
+</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-- 
cgit v1.2.3