search

javaee-samples / javaee7-samples

Java EE 7 Samples
https://travis-ci.org/javaee-samples/javaee7-samples
Other
2.51k stars 1.66k forks source link

Fix tabs/spaces in pom.xml and resolve unnoticed merge conflict #432

Closed arjantijms closed 6 years ago

arjantijms commented 6 years ago

Fix tabs/spaces in pom.xml and resolve unnoticed merge conflict