Merged #33 "Merge overrides in addition to merging the normal settings"

James Moger

2014-03-17 4ff1429245b3748372643251a92d71821f257ccf

 src/main/java/com/gitblit/models/FederationSet.java

@@ -37,7 +37,7 @@


   /**

    * The constructor for a federation set.

    * 
    *

    * @param name

    *            the name of this federation set

    * @param tokenType