From eaa031075c354bdef9ce568f6d8ca3b41047a3f3 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 11 Oct 2010 15:36:17 +0530
Subject: [PATCH] remove conflicts

bzr revid: apa@tinyerp.com-20101011100617-noz4sgp9xfpevzgv
---
 .../report/report_emp_salary_structure.rml       | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index 8e2b69c43e2..e5505eb5b02 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -437,14 +437,10 @@
         </tr>
       </blockTable>
       <section>
-<<<<<<< TREE
-        <blockTable colWidths="34.0,116.0,40.0,67.0,44.0,109.0,70.0,59.0" style="Table5">
-=======
         <para style="terp_default_1">
           <font color="white"> </font>
         </para>
         <blockTable colWidths="34.0,341.0,80.0,83.0" style="Table5">
->>>>>>> MERGE-SOURCE
           <tr>
             <td>
               <para style="terp_tblheader_Details">Code</para>
@@ -484,12 +480,9 @@
         </section>
       </section>
     </section>
-<<<<<<< TREE
-=======
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
->>>>>>> MERGE-SOURCE
     <blockTable colWidths="539.0" style="Table10">
       <tr>
         <td>
@@ -498,14 +491,10 @@
       </tr>
     </blockTable>
     <section>
-<<<<<<< TREE
-      <blockTable colWidths="34.0,116.0,40.0,67.0,44.0,109.0,128.0" style="Table11">
-=======
       <para style="terp_default_1">
         <font color="white"> </font>
       </para>
       <blockTable colWidths="34.0,338.0,82.0,84.0" style="Table11">
->>>>>>> MERGE-SOURCE
         <tr>
           <td>
             <para style="terp_tblheader_Details">Code</para>
@@ -522,13 +511,8 @@
         </tr>
       </blockTable>
       <section>
-<<<<<<< TREE
-        <para style="terp_default_1">[[repeatIn(employee.line_ids,'line1')]]</para>
-        <blockTable colWidths="34.0,117.0,39.0,67.0,44.0,110.0,128.0" style="Table12">
-=======
         <para style="terp_default_9">[[repeatIn(employee.line_ids,'line1')]]</para>
         <blockTable colWidths="34.0,338.0,81.0,86.0" style="Table12">
->>>>>>> MERGE-SOURCE
           <tr>
             <td>
               <para style="terp_default_9">[[ line1.code or '' ]]</para>