diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2017-01-18 10:25:44 -0500 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2017-01-18 10:25:44 -0500 |
| commit | ac4d6327859af35107e1b75e2aba14431f75afde (patch) | |
| tree | d2fd9b0ecbc3284b117ec4760bee42ceaccdeb18 | |
| parent | 85476cb28257bf5d2a4b89f1dfb73baa47a8bd67 (diff) | |
| download | sdl_ios-ac4d6327859af35107e1b75e2aba14431f75afde.tar.gz | |
Fix merge errors
| -rw-r--r-- | SmartDeviceLink/SDLSubscribeVehicleDataResponse.h | 2 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h index ede67c21c..b32c0ca7a 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h @@ -117,3 +117,5 @@ NS_ASSUME_NONNULL_BEGIN @property (strong, nonatomic, nullable) SDLVehicleDataResult *myKey; @end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h index edc6f1ec9..bced5894e 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h @@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN /** * @abstract A SDLVehicleDataResult* value. The vehicle speed in kilometers per hour. */ -@property (strong, nonatomic, nullableSDLVehicleDataResult *speed; +@property (strong, nonatomic, nullable) SDLVehicleDataResult *speed; /** * @abstract A SDLVehicleDataResult* value. The number of revolutions per minute of the engine. |