# Conflicts:
#   .gitlab-ci.yml
#   README.md
#   ebill_paynet/__manifest__.py
#   ebill_paynet/components/api.py
#   ebill_paynet/i18n/de.po
#   ebill_paynet/i18n/ebill_paynet.pot
#   ebill_paynet/i18n/fr.po
#   ebill_paynet/messages/invoice-2003A.xml
#   ebill_paynet/models/paynet_service.py
#   ebill_paynet/tests/common.py
#   ebill_paynet/tests/examples/invoice_isr_b2b.xml
#   ebill_paynet/tests/examples/invoice_qr_b2b.xml
#   ebill_paynet/tests/test_invoice_message.py
#   ebill_paynet/tests/test_invoice_message_b2b.py
#   ebill_paynet/views/paynet_service.xml
#   ebill_paynet_customer_free_ref/__manifest__.py
#   ebill_paynet_customer_free_ref/tests/examples/invoice_b2b.xml
#   ebill_paynet_customer_free_ref/tests/test_ebill_paynet_customer_free_ref.py
#   l10n_ch_invoice_reports/__manifest__.py
#   l10n_ch_invoice_reports/data/reports.xml
#   l10n_ch_invoice_reports/i18n/l10n_ch_invoice_reports.pot
#   l10n_ch_invoice_reports/models/report.py
#   l10n_ch_isr_payment_grouping/tests/test_l10n_ch_payment_isr.py
#   l10n_ch_isrb/COPYRIGHT