<<<<<<< .working
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
               .,\
               plugin.xml,\
               icons/,\
               plugin.properties,\
               doc/
src.includes = META-INF/,\
               doc/,\
               icons/,\
               plugin.properties,\
               src/
=======
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
               .,\
               icons/,\
               about.html,\
               plugin.properties
>>>>>>> .merge-right.r1063