From d62d883423c4f13e9514c203d2f0b14e4715df7f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 23 May 2014 09:19:01 -0400
Subject: [PATCH] Tag server-side merges when incremental push tags are enabled

---
 src/main/java/com/gitblit/authority/AuthorityWorker.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/gitblit/authority/AuthorityWorker.java b/src/main/java/com/gitblit/authority/AuthorityWorker.java
index 262bbb5..37a0df6 100644
--- a/src/main/java/com/gitblit/authority/AuthorityWorker.java
+++ b/src/main/java/com/gitblit/authority/AuthorityWorker.java
@@ -35,6 +35,7 @@
 		return doRequest();
 	}
 
+	@Override
 	protected void done() {
 		parent.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
 		try {

--
Gitblit v1.9.1