From 539784e2d5942e8f7ad7b8e8d4656e659fe2e14a Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 13 Nov 2011 17:19:20 +0100
Subject: [PATCH] resolve maven conflict

---
 scm-webapp/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index 1b053644ab..b4375a626c 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -57,6 +57,12 @@
       <version>1.9-SNAPSHOT</version>
     </dependency>
 
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-server</artifactId>
+      <version>${jersey.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-json</artifactId>