From 6c1f672ffe64fab7ebb2594edf6eefc85b3b420e Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sat, 13 Dec 2014 16:28:02 +0100
Subject: [PATCH] fix merge issue

---
 scm-server/src/main/conf/server-config.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scm-server/src/main/conf/server-config.xml b/scm-server/src/main/conf/server-config.xml
index 561a6ad57f..c591b1a7a2 100644
--- a/scm-server/src/main/conf/server-config.xml
+++ b/scm-server/src/main/conf/server-config.xml
@@ -127,8 +127,8 @@
       </Set>
     </New>
   </Set>
-<<<<<<< mine
-=======
+  
+  <!-- TODO fix for jetty 9.2.x -->
   
   <!-- request logging -->
   <!--
@@ -211,6 +211,5 @@
     </Call>
   </Get>
   -->
->>>>>>> theirs
 
 </Configure>