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/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