diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index bf7cedfb24b..98b242443a4 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -56,16 +56,6 @@ -<<<<<<< TREE -======= - - - - - - - ->>>>>>> MERGE-SOURCE