odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

remove conflicts 

bzr revid: apa@tinyerp.com-20101011100419-jzburzmpos92am48
This commit is contained in:
apa-tiny 2010-10-11 15:34:19 +05:30
parent a82e2f729c
commit 7a30f6643b
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/hr_payroll/report/report_employees_detail.rml
View File

@ -440,11 +440,8 @@
</tr>
</blockTable>
<section>
<<<<<<< TREE
<para style="terp_default_1">[[ repeatIn(get_deduct(),'e2') ]]</para>
=======
<para style="terp_default_9">[[ repeatIn(get_deduct(),'e2') ]]</para>
>>>>>>> MERGE-SOURCE
<blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table8">
<tr>
<td>
@ -500,11 +497,7 @@
</tr>
</blockTable>
<section>
<<<<<<< TREE
<para style="terp_default_1">[[ repeatIn(get_other(),'e3') ]]</para>
=======
<para style="terp_default_9">[[ repeatIn(get_other(),'e3') ]]</para>
>>>>>>> MERGE-SOURCE
<blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table9">
<tr>
<td>