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/test/java/com/gitblit/tests/X509UtilsTest.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/gitblit/tests/X509UtilsTest.java b/src/test/java/com/gitblit/tests/X509UtilsTest.java
index 668626b..740f908 100644
--- a/src/test/java/com/gitblit/tests/X509UtilsTest.java
+++ b/src/test/java/com/gitblit/tests/X509UtilsTest.java
@@ -26,7 +26,6 @@
 
 import org.eclipse.jgit.util.FileUtils;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -43,7 +42,7 @@
  * @author James Moger
  *
  */
-public class X509UtilsTest extends Assert {
+public class X509UtilsTest extends GitblitUnitTest {
 
 	// passwords are case-sensitive and may be length-limited
 	// based on the JCE policy files

--
Gitblit v1.9.1