From a1e92467947074c5feef8d2199b6177be4c7cb4b Mon Sep 17 00:00:00 2001 From: Laurent Dinclaux Date: Fri, 5 May 2017 10:34:38 +1100 Subject: [PATCH] Resolved merge conflict [2] --- htdocs/comm/propal/class/propal.class.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 3df1c82b4ad..7b05adf1fb6 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -3626,11 +3626,7 @@ class PropaleLigne extends CommonObjectLine $this->qty = $objp->qty; $this->price = $objp->price; // deprecated $this->subprice = $objp->subprice; -<<<<<<< HEAD - $this->vat_src_code = $objp->vat_src_code; -======= $this->vat_src_code = $objp->vat_src_code; ->>>>>>> upstream/5.0 $this->tva_tx = $objp->tva_tx; $this->remise = $objp->remise; // deprecated $this->remise_percent = $objp->remise_percent;