# Conflicts: # .gitignore # xml/dtd/invoice.xsd # xml/source/quickscope.xml # xml/xslt/generate_invoice.xsl