From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0

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

diff --git a/src/main/java/com/gitblit/models/FederationProposal.java b/src/main/java/com/gitblit/models/FederationProposal.java
index 5cf9182..de1b8e6 100644
--- a/src/main/java/com/gitblit/models/FederationProposal.java
+++ b/src/main/java/com/gitblit/models/FederationProposal.java
@@ -37,14 +37,14 @@
 	public FederationToken tokenType;
 
 	public String token;
-	
+
 	public String message;
 
 	public Map<String, RepositoryModel> repositories;
 
 	/**
 	 * The constructor for a federation proposal.
-	 * 
+	 *
 	 * @param url
 	 *            the url of the source Gitblit instance
 	 * @param tokenType

--
Gitblit v1.9.1