From d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Mar 2014 14:32:08 -0500
Subject: [PATCH] Fixed bug in merge: improper use of force and failing on FORCED result

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

diff --git a/src/test/java/de/akquinet/devops/GitblitRunnable.java b/src/test/java/de/akquinet/devops/GitblitRunnable.java
index 66a31e3..32983d8 100644
--- a/src/test/java/de/akquinet/devops/GitblitRunnable.java
+++ b/src/test/java/de/akquinet/devops/GitblitRunnable.java
@@ -18,7 +18,6 @@
 import java.net.InetAddress;
 import java.net.ServerSocket;
 
-import com.gitblit.GitBlitServer;
 import com.gitblit.tests.GitBlitSuite;
 
 /**

--
Gitblit v1.9.1