subh_pal_org
/
cor
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove conflict

This commit is contained in:
Pawan Kumar 2021-03-09 11:34:55 +05:30
parent 6410ece7fa
commit cc70afeb4b
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cor_custom/views/analytic_view.xml
View File

@ -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>