rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Resolve missed merge conflict. #329

Browse source
This commit is contained in:
Korina Cordero 2020-02-06 05:43:15 +00:00
parent 60e3d3673f
commit 49d0e6b97e
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Controller/RAPIController.php
View file

@ -651,16 +651,9 @@ class RAPIController extends Controller
// TODO: this has to move to JOHandler // TODO: this has to move to JOHandler
$this->updateVehicleBattery($jo); $this->updateVehicleBattery($jo);
<<<<<<< HEAD
// create warranty
if ($jo->getServiceType() == ServiceType::BATTERY_REPLACEMENT_NEW)
=======
$em->flush();
// create warranty // create warranty
if (($jo->getServiceType() == ServiceType::BATTERY_REPLACEMENT_NEW) || if (($jo->getServiceType() == ServiceType::BATTERY_REPLACEMENT_NEW) ||
($jo->getServiceType() == CMBServiceType::BATTERY_REPLACEMENT_NEW)) ($jo->getServiceType() == CMBServiceType::BATTERY_REPLACEMENT_NEW))
>>>>>>> 3e2d0db5cd7c0e67f7c41c61f98761d38e424adc
{ {
$serial = null; $serial = null;
$warranty_class = $jo->getWarrantyClass(); $warranty_class = $jo->getWarrantyClass();