fixed merge OL PA

src/container/OutlookPA/ProfitLossOLPA.js

@@ -343,7 +343,6 @@ export default class ProfitLossOLPA extends Component {
         this.state.dataTable.map(i => {
             data.push({
                 item_report_id: i[1],
-<<<<<<< HEAD
                 total_actual_before: String(Number(i[7]).toFixed(1)),
                 january: String(Number(i[8]).toFixed(1)),
                 february: String(Number(i[9]).toFixed(1)),
@@ -360,22 +359,6 @@ export default class ProfitLossOLPA extends Component {
                 total_current_year: String(Number(i[20]).toFixed(1)),
                 total_next_year: String(Number(i[21]).toFixed(1)),
                 total_more_year: String(Number(i[22]).toFixed(1)),
-=======
-                total_actual_before: String(Number(i[6]).toFixed(1)),
-                january: String(Number(i[7]).toFixed(1)),
-                february: String(Number(i[8]).toFixed(1)),
-                march: String(Number(i[9]).toFixed(1)),
-                april: String(Number(i[10]).toFixed(1)),
-                may: String(Number(i[11]).toFixed(1)),
-                june: String(Number(i[12]).toFixed(1)),
-                july: String(Number(i[13]).toFixed(1)),
-                august: String(Number(i[14]).toFixed(1)),
-                september: String(Number(i[15]).toFixed(1)),
-                october: String(Number(i[16]).toFixed(1)),
-                november: String(Number(i[17]).toFixed(1)),
-                december: String(Number(i[18]).toFixed(1)),
-                total_current_year: String(Number(i[19]).toFixed(1)),
->>>>>>> 9627018c1b5062903316e927a20a6470a0e137cf
             })
         })
         let body = {