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/GitBlitException.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/GitBlitException.java b/src/main/java/com/gitblit/GitBlitException.java
index 7ab0f99..6cf06bc 100644
--- a/src/main/java/com/gitblit/GitBlitException.java
+++ b/src/main/java/com/gitblit/GitBlitException.java
@@ -19,9 +19,9 @@
/**
* GitBlitException is a marginally useful class. :)
- *
+ *
* @author James Moger
- *
+ *
*/
public class GitBlitException extends IOException {
--
Gitblit v1.9.1