From 4ff1429245b3748372643251a92d71821f257ccf Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Mar 2014 09:36:09 -0400
Subject: [PATCH] Merged #33 "Merge overrides in addition to merging the normal settings"

---
 src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java b/src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java
index aebde9a..d144a24 100644
--- a/src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java
+++ b/src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java
@@ -26,8 +26,6 @@
 import org.junit.Test;
 
 import com.gitblit.Constants;
-import com.gitblit.GitBlitServer;
-import com.gitblit.tests.GitBlitSuite;
 
 /**
  * This test checks if it is possible to run two server instances in the same

--
Gitblit v1.9.1