diff options
| author | Muller, Alexander (A.) <amulle19@ford.com> | 2017-01-17 12:18:46 -0800 |
|---|---|---|
| committer | Muller, Alexander (A.) <amulle19@ford.com> | 2017-01-17 12:18:46 -0800 |
| commit | bfac2fa01fd4fee31dbf8a69199a51d2ad57821d (patch) | |
| tree | f28493b4390379318c0bc7a7d0a55099bdc35c08 /SmartDeviceLink/SDLAlert.m | |
| parent | db28ddffb21d4c32a91c0c818bd5eebbab019ce7 (diff) | |
| parent | f44eba087b5f26897a6d126eedc691299f369782 (diff) | |
| download | sdl_ios-bfac2fa01fd4fee31dbf8a69199a51d2ad57821d.tar.gz | |
Merge remote-tracking branch 'origin/develop' into feature/sdl_0018_nullability_annotationsfeature/sdl_0018_nullability_annotations
* origin/develop:
Removed SDLTTSChunkFactory from project.
Removed SDLRPCRequestFactory from project.
# Conflicts:
# SmartDeviceLink/SDLRPCRequestFactory.h
# SmartDeviceLink/SDLRPCRequestFactory.m
# SmartDeviceLink/SDLTTSChunkFactory.h
# SmartDeviceLink/SDLTTSChunkFactory.m
Diffstat (limited to 'SmartDeviceLink/SDLAlert.m')
| -rw-r--r-- | SmartDeviceLink/SDLAlert.m | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m index cb47831fb..c1a1f04d4 100644 --- a/SmartDeviceLink/SDLAlert.m +++ b/SmartDeviceLink/SDLAlert.m @@ -5,7 +5,6 @@ #import "SDLNames.h" #import "SDLSoftButton.h" #import "SDLTTSChunk.h" -#import "SDLTTSChunkFactory.h" static UInt16 const SDLDefaultDuration = 5000; |