Conflicts: .gitignore target/m2e-wtp/web-resources/META-INF/maven/osc.git.eh3/useful-code/pom.properties |
||
---|---|---|
.settings | ||
src/main/webapp | ||
target/m2e-wtp/web-resources/META-INF/maven/osc.git.eh3/useful-code | ||
.classpath | ||
.gitignore | ||
.project | ||
LICENSE | ||
pom.xml |