diff options
| author | NicoleYarroch <nicole@livio.io> | 2018-06-07 08:47:11 -0400 |
|---|---|---|
| committer | NicoleYarroch <nicole@livio.io> | 2018-06-07 08:47:11 -0400 |
| commit | f0df9f54da656cb9095062857d06446f62a8af9d (patch) | |
| tree | d606d4a76db9396d00f783a4e8856f34f310ace3 /SmartDeviceLink/SDLGetVehicleDataResponse.h | |
| parent | 193407a55b079c272b1f2fea30dae92e1e1a9f41 (diff) | |
| download | sdl_ios-f0df9f54da656cb9095062857d06446f62a8af9d.tar.gz | |
Removed merge conflict markers
Signed-off-by: NicoleYarroch <nicole@livio.io>
Diffstat (limited to 'SmartDeviceLink/SDLGetVehicleDataResponse.h')
| -rw-r--r-- | SmartDeviceLink/SDLGetVehicleDataResponse.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index 6bc2ca167..ec0c8de3f 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -118,7 +118,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nullable, strong, nonatomic) SDLHeadLampStatus *headLampStatus; /** - The estimated percentage (0% - 100%) of remaining oil life of the engine. + The estimated percentage (0% - 100%) of remaining oil life of the engine */ @property (strong, nonatomic, nullable) NSNumber<SDLFloat> *engineOilLife; |