merge fix

This commit is contained in:
Aleksandar Dudukovic 2017-05-03 21:07:49 +02:00
commit 64337dff06
2 changed files with 2 additions and 2 deletions

1
marker/.gitignore vendored Normal file
View File

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

View File

@ -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>