invoice

Author: Andreas Müller

src/gtt-report.js

@@ -131,16 +131,13 @@ config
     .set('type', program.opts().type)
     .set('subgroups', program.opts().subgroups)
     .set('_verbose', program.opts().verbose)
-<<<<<<< Updated upstream
-=======
     .set('invoiceTitle', program.opts().invoiceTitle)
     .set('invoiceAddress', program.opts().invoiceAddress)
     .set('invoiceCurrency', program.opts().invoiceCurrency)
     .set('invoiceCurrencyPerHour', program.opts().invoiceCurrencyPerHour)
     .set('invoiceVAT', program.opts().invoiceVAT)
     .set('invoiceDate', program.opts().invoiceDate)
     .set('invoiceCurrencyMaxUnit', program.opts().invoiceCurrencyMaxUnit)
->>>>>>> Stashed changes
     .set('_createDump', program.opts().output === 'dump');
 
 // date shortcuts