From a9d4bf30bb55acf889538ab715dba1c682d2d38a Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 24 Sep 2012 15:03:35 +0200
Subject: [PATCH] [MERGE]removed some conflicts in view

bzr revid: csn@openerp.com-20120924130335-vvkhdz9jexcnsqrq
---
 addons/fleet/fleet_view.xml | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 330c4b61d62..f758ce680b6 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -228,17 +228,21 @@
         </record>
 
         <record model='ir.ui.view' id='fleet_vehicle_log_tree'>
-            <field name="name">fleet.vehicle.log.tree</field>
-            <field name="model">fleet.vehicle.log</field>
-            <field name="arch" type="xml">
-                <tree string="Logs">
-                    <field name="type" />
-                    <field name="create_date" />
-                    <field name="vehicle_id" />
-                    <field name="employee_id" />
-                    <field name="description" />
-                </tree>
-            </field>
+            
+                    <field name="name">fleet.vehicle.log.tree</field>
+                    <field name="model">fleet.vehicle.log</field>
+                    <field name="arch" type="xml">
+                        <tree string="Logs">
+                            
+                                        <field name="type" />
+                                        <field name="create_date" />
+                                        <field name="vehicle_id" />
+                                        <field name="employee_id" />
+                                        <field name="description" />
+                           
+                        </tree>
+                    </field>
+            
         </record>
 
         <record model='ir.actions.act_window' id='fleet_vehicle_log_act'>