Remove git conflict message. #311

2020-02-05 23:47:53 +00:00 · 2020-02-05 23:47:53 +00:00 · 91182fbc38
commit 91182fbc38
parent 36657cbdf0
1 changed files with 0 additions and 1 deletions
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@ -2197,7 +2197,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
        return null;
    }

-<<<<<<< HEAD
    public function updateVehicleBattery(JobOrder $jo)
    {
        // check if new battery