Fixed bug in merge: improper use of force and failing on FORCED result

James Moger

2014-03-06 d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd

 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;

/**