blob: 40a3050781c37f70d803ceb5da590f75442f4fd1 [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-2.0.html
src.includes = about.properties, about.mappings, about.ini, about.html, license.html,\
LICENSE.txt,\
epl-2.0.html
>>>>>>> branch 'development' of ssh://osbp@10.1.13.14/cxgit/org.eclipse.osbp.utils.functionnormalizer.git