From 31d5b333012aee13e66f0f0acf6bc1a907fbc974 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 17 Sep 2011 14:10:44 +0200
Subject: [PATCH] fix

bzr revid: fp@tinyerp.com-20110917121044-xleca2g3pve2qs4n
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 10 ----------
 1 file changed, 10 deletions(-)

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 @@
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
                         <field name="period_id" groups="base.group_extended"/>
                     </group>
-<<<<<<< TREE
-=======
-                    <newline/>
-                    <group expand="0" string="Extended Filters...">
-                        <field name="reference"/>
-                        <field name="name"/>
-                        <field name="narration"/>
-                        <field name="amount"/>
-                   </group>
->>>>>>> MERGE-SOURCE
                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>