From 9186c6413e7cdfc33527ca69d2e56dfec6d8b760 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 18:59:24 -0400
Subject: [PATCH] Merge non-fast-forward for release branch merges

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

diff --git a/src/main/java/com/gitblit/models/FeedModel.java b/src/main/java/com/gitblit/models/FeedModel.java
index 08f9e48..5fc6c1f 100644
--- a/src/main/java/com/gitblit/models/FeedModel.java
+++ b/src/main/java/com/gitblit/models/FeedModel.java
@@ -22,7 +22,7 @@
 
 /**
  * FeedModel represents a syndication (RSS) feed.
- * 
+ *
  * @author James Moger
  */
 public class FeedModel implements Serializable, Comparable<FeedModel> {

--
Gitblit v1.9.1