resolved conflicts

Author: subyssurendran666

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterMarkdownTest.java

@@ -2157,7 +2157,6 @@ public void testMarkdownURLs4531_12() throws JavaModelException {
 				/// @see [Ex Si](http://ex.com    ) [Ex Si](    https://www.ex.com)
 				public class Markdown() {}
 				""";
-
 		this.workingCopies = new ICompilationUnit[1];
 		this.workingCopies[0] = getWorkingCopy("/Converter_25/src/markdown/gh3761/Markdown.java", source, null);
 		if (this.docCommentSupport.equals(JavaCore.ENABLED)) {