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

Resolve "Transition branch for CMB and Resq merging" #1181

Merged
korina.cordero merged 258 commits from 329-transition-branch-for-cmb-and-resq-merging into master 2020-04-03 02:49:26 +00:00
Conversation 18 Commits 258 Files changed 143 -1
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 91182fbc38 - Show all commits

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

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