17 lines
376 B
Text
17 lines
376 B
Text
<<<<<<< HEAD
|
|
/target/
|
|
=======
|
|
# ---> Maven
|
|
target/
|
|
pom.xml.tag
|
|
pom.xml.releaseBackup
|
|
pom.xml.versionsBackup
|
|
pom.xml.next
|
|
release.properties
|
|
dependency-reduced-pom.xml
|
|
buildNumber.properties
|
|
.mvn/timing.properties
|
|
# https://github.com/takari/maven-wrapper#usage-without-binary-jar
|
|
.mvn/wrapper/maven-wrapper.jar
|
|
|
|
>>>>>>> branch 'master' of https://gitdab.com/Minecon724/giants
|