blob: c72fb4565b12d84d7353e7b6b80fb4afd85fe4ad [file] [log] [blame]
<<<<<<< HEAD
source.. = src/
output.. = target/classes/
bin.includes = about.properties, about.mappings, about.ini, about.html, META-INF/,\
.
=======
source.. = src/
output.. = target/classes/
bin.includes = about.properties, about.mappings, about.ini, about.html, META-INF/,\
.,\
license.html,\
LICENSE.txt,\
epl-v10.html
src.includes = about.properties, about.mappings, about.ini, about.html, license.html,\
LICENSE.txt,\
epl-v10.html
>>>>>>> branch 'development' of ssh://osbp@10.1.13.14/cxgit/org.eclipse.osbp.utils.functionnormalizer.git