From cc70afeb4b4bd096eb31716c05542ad47a0a91dd Mon Sep 17 00:00:00 2001
From: Pawan Kumar <pawan.sharma@sunarctechnologies.com>
Date: Tue, 9 Mar 2021 11:34:55 +0530
Subject: [PATCH] remove conflict

---
 cor_custom/views/analytic_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cor_custom/views/analytic_view.xml b/cor_custom/views/analytic_view.xml
index 98a8514..acdac25 100755
--- a/cor_custom/views/analytic_view.xml
+++ b/cor_custom/views/analytic_view.xml
@@ -179,8 +179,6 @@
         </field>
     </record>
 
-<<<<<<< HEAD
-=======
     <record id="timesheet_view_inherit1_search" model="ir.ui.view">
         <field name="name">account.analytic.line.search</field>
         <field name="model">account.analytic.line</field>