From 7b0b4cca4f9d33a72a382adf7e96e616e9901dbf Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 11 Dec 2008 13:46:39 +0100
Subject: [PATCH] bugfix

bzr revid: fp@tinyerp.com-20081211124639-jzp2oud0q5y6o84a
---
 addons/report_document/report_document_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/report_document/report_document_view.xml b/addons/report_document/report_document_view.xml
index e739a3fe629..b4b5eaca1d5 100644
--- a/addons/report_document/report_document_view.xml
+++ b/addons/report_document/report_document_view.xml
@@ -2,7 +2,6 @@
 <openerp>
  <data>
 
-<<<<<<< TREE
     <record model="ir.ui.view" id="view_document_user_form">
             <field name="name">report.document.user.form</field>
             <field name="model">report.document.user</field>