From 91182fbc381ff1862aba07649b095add08098d08 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Wed, 5 Feb 2020 23:47:53 +0000
Subject: [PATCH] Remove git conflict message. #311

---
 src/Service/JobOrderHandler/CMBJobOrderHandler.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 27631d7f..de8581ad 100644
--- 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