Fixed bug in merge: improper use of force and failing on FORCED result

James Moger

2014-03-06 d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd

 src/test/java/com/gitblit/tests/MarkdownUtilsTest.java

@@ -15,13 +15,11 @@
 */

package com.gitblit.tests;



import static org.junit.Assert.assertEquals;



import org.junit.Test;



import com.gitblit.utils.MarkdownUtils;



public class MarkdownUtilsTest {

public class MarkdownUtilsTest extends GitblitUnitTest {



   @Test

   public void testMarkdown() throws Exception {