From d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Mar 2014 14:32:08 -0500
Subject: [PATCH] Fixed bug in merge: improper use of force and failing on FORCED result
---
src/main/java/com/gitblit/models/FeedEntryModel.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/models/FeedEntryModel.java b/src/main/java/com/gitblit/models/FeedEntryModel.java
index e1c00c3..c94f6e9 100644
--- a/src/main/java/com/gitblit/models/FeedEntryModel.java
+++ b/src/main/java/com/gitblit/models/FeedEntryModel.java
@@ -21,7 +21,7 @@
/**
* FeedEntryModel represents an entry in a syndication (RSS) feed.
- *
+ *
* @author James Moger
*/
public class FeedEntryModel implements Serializable, Comparable<FeedEntryModel> {
--
Gitblit v1.9.1