diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index 968398b4ef2..7fe4acbf241 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -54,16 +54,6 @@ -<<<<<<< TREE -======= - - - - - - - ->>>>>>> MERGE-SOURCE