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/test/java/com/gitblit/tests/Base64Test.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/Base64Test.java b/src/test/java/com/gitblit/tests/Base64Test.java
index 2962c36..16ca2ad 100644
--- a/src/test/java/com/gitblit/tests/Base64Test.java
+++ b/src/test/java/com/gitblit/tests/Base64Test.java
@@ -15,13 +15,11 @@
*/
package com.gitblit.tests;
-import static org.junit.Assert.assertEquals;
-
import org.junit.Test;
import com.gitblit.utils.Base64;
-public class Base64Test {
+public class Base64Test extends GitblitUnitTest {
@Test
public void testBase64() {
--
Gitblit v1.9.1