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

Remove git conflict message. #311

Browse source
This commit is contained in:
Korina Cordero 2020-02-05 23:47:53 +00:00
parent 36657cbdf0
commit 91182fbc38
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Service/JobOrderHandler/CMBJobOrderHandler.php
View file

@ -2197,7 +2197,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
return null; return null;
} }
<<<<<<< HEAD
public function updateVehicleBattery(JobOrder $jo) public function updateVehicleBattery(JobOrder $jo)
{ {
// check if new battery // check if new battery