merge fix

Author: 4lexis

marker/.gitignore

@@ -0,0 +1 @@
+/target/

marker/pom.xml

@@ -18,7 +18,6 @@
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
     THE SOFTWARE.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -47,4 +46,4 @@
     </dependencies>
 
 
-</project>
+</project>