From 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Mar 2014 09:31:52 -0400
Subject: [PATCH] Merge overrides in addition to merging the normal settings

---
 src/main/java/com/gitblit/models/FederationSet.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gitblit/models/FederationSet.java b/src/main/java/com/gitblit/models/FederationSet.java
index 357689c..dede66b 100644
--- a/src/main/java/com/gitblit/models/FederationSet.java
+++ b/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

--
Gitblit v1.9.1