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/IProjectManager.java

@@ -21,7 +21,7 @@
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;

public interface IProjectManager {
public interface IProjectManager extends IManager {

   /**
    * Returns a list of project models for the user.