From 8a861dbc88ce8ab333ca05ff6afce9c7fce23e3b Mon Sep 17 00:00:00 2001
From: venbatechnologies <venbatechnologies@gmail.com>
Date: Tue, 5 Jun 2018 16:21:48 +0530
Subject: [PATCH] git merge conflict changes:

---
 application/controllers/purchaseorder.php      | 4 ----
 application/views/editRevenuepurchaseorder.php | 9 +--------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index 859edee8..7d20d269 100644
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -4277,13 +4277,9 @@ function addloadfile()
  {
 
   $pono= $this->input->post('PONO');
-<<<<<<< HEAD
 
   $igr= $this->input->post('igr');
 
-
-=======
->>>>>>> 2f9b1f114929c7e837953faff4845edd95f3f8b8
   $new_file_name =$_FILES['file']['name'];
   //echo $new_file_name;die;
   if(!empty($new_file_name))
diff --git a/application/views/editRevenuepurchaseorder.php b/application/views/editRevenuepurchaseorder.php
index e04b0c93..4980079b 100644
--- a/application/views/editRevenuepurchaseorder.php
+++ b/application/views/editRevenuepurchaseorder.php
@@ -6032,21 +6032,14 @@ function  fileupload(counter)
                     var igr =$('#hiddenigrno').val();
                     //alert(igr);
 
-
-
-<<<<<<< HEAD
-
                     formData.append('file',file);
                     formData.append('PONO',PONO);
                     formData.append('count',counter);
                     formData.append('igr',igr);
-=======
                     formData.append('file',file);
                     formData.append('PONO',PONO);
                     formData.append('count',counter);
->>>>>>> 2f9b1f114929c7e837953faff4845edd95f3f8b8
-
-                             $('.content').loader('show'); 
+                       $('.content').loader('show'); 
     $.ajax({ 
                     data:formData,
                     type:"POST",