Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 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.