From 4ff1429245b3748372643251a92d71821f257ccf Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Mar 2014 09:36:09 -0400
Subject: [PATCH] Merged #33 "Merge overrides in addition to merging the normal settings"
---
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