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

James Moger

2014-03-06 d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd

 src/main/java/com/gitblit/manager/IRuntimeManager.java

@@ -24,7 +24,7 @@
import com.gitblit.models.ServerSettings;
import com.gitblit.models.ServerStatus;

public interface IRuntimeManager {
public interface IRuntimeManager extends IManager {

   void setBaseFolder(File folder);