Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 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() {