resolve conflict

This commit is contained in:
sonal arora
2020-09-13 09:04:39 +00:00
parent e6612fc8be
commit 7fbda55eb2

View File

@@ -2,8 +2,8 @@
<odoo> <odoo>
<data> <data>
<!-- QWeb Reports --> <!-- QWeb Reports -->
<!--
<!-- <record id="paperformat_payment_receipt" model="report.paperformat"> <record id="paperformat_payment_receipt" model="report.paperformat">
<field name="name">A4 Payment Receipt</field> <field name="name">A4 Payment Receipt</field>
<field name="default" eval="True" /> <field name="default" eval="True" />
<field name="format">A4</field> <field name="format">A4</field>