Merged #85 "Tag server-side merges when incremental push tags are enabled"

James Moger

2014-05-23 c51db7be8f6f48ddebff5053915be68f77e3fc94

 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