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/manager/IGitblit.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/gitblit/manager/IGitblit.java b/src/main/java/com/gitblit/manager/IGitblit.java
index aa09122..50210e9 100644
--- a/src/main/java/com/gitblit/manager/IGitblit.java
+++ b/src/main/java/com/gitblit/manager/IGitblit.java
@@ -26,6 +26,7 @@
 import com.gitblit.models.RepositoryUrl;
 import com.gitblit.models.TeamModel;
 import com.gitblit.models.UserModel;
+import com.gitblit.tickets.ITicketService;
 
 public interface IGitblit extends IManager,
 									IRuntimeManager,
@@ -101,4 +102,11 @@
 	 */
 	Collection<GitClientApplication> getClientApplications();
 
+	/**
+	 * Returns the ticket service.
+	 *
+	 * @return a ticket service
+	 */
+	ITicketService getTicketService();
+
 }
\ No newline at end of file

--
Gitblit v1.9.1