Added dummy file so folder exists for test case

src/main/java/spoon/support/compiler/SpoonPom.java

@@ -133,7 +133,7 @@ public SpoonPom(String path, SpoonPom parent, MavenLauncher.SOURCE_TYPE sourceTy
 		}
 	}
 
-	public void addModule(SpoonPom module) {
+	private void addModule(SpoonPom module) {
 		modules.add(module);
 	}
 

src/test/java/spoon/support/compiler/SpoonPomTest.java

@@ -6,12 +6,9 @@
 import spoon.support.StandardEnvironment;
 
 import java.io.IOException;
-<<<<<<< HEAD
 import java.util.List;
 import java.util.regex.Pattern;
-=======
 import java.nio.file.Paths;
->>>>>>> 7c8b18599... Added test for getting maven source directory from ancestors
 
 import static org.junit.Assert.*;
 
@@ -69,6 +66,6 @@ public void checkSourceDirectory(String path, String expected) throws IOExceptio
 		SpoonPom childModel = pomModel.getModules().get(0);
 		//contract: source directory is derived from parent pom.xml if not declared in the current
 		// (childModel) SpoonPom
-		assertEquals(expected, childModel.getSourceDirectories().get(0).getAbsolutePath(), expected);
+		assertEquals(expected, childModel.getSourceDirectories().get(0).getAbsolutePath());
 	}
 }

src/test/resources/maven-launcher/hierarchy/child/src/Test.java

@@ -0,0 +1,5 @@
+package maven-launcher.hierarchy.child.src;
+
+public class Test {
+
+}