fix cnab240 merge

Trust-Code · Nov 27, 2018 · cd6096d · cd6096d
1 parent e5dad72
commit cd6096d
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/br_payment_cnab/serialize/cnab240.py b/br_payment_cnab/serialize/cnab240.py
@@ -194,11 +194,8 @@ def _get_header_lot(self, line, num_lot, lot):
         information_id = line.payment_information_id
         bank = self._order.src_bank_account_id
         header_lot = {
-<<<<<<< HEAD
             'forma_pagamento': lot,
-=======
             'forma_lancamento': lot,
->>>>>>> 727749370ba05d284dbfb10a42fbe3255b399c1d
             "controle_lote": num_lot,
             "tipo_servico": int(information_id.service_type),
             "cedente_inscricao_tipo": 2,