diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2017-04-18 11:08:32 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2017-04-18 11:08:32 -0400 |
| commit | 55a0d236fed0bf576b73cfc7c254670b7bc8a134 (patch) | |
| tree | 90a9cd229c5813e7378575b14a68889030ebbe52 /SmartDeviceLink/SDLProxyFactory.m | |
| parent | a912993d78989e288746516e35af2a25677b43ec (diff) | |
| parent | defbaecd441a10655498eebd5cfd1e57e5e3cf87 (diff) | |
| download | sdl_ios-55a0d236fed0bf576b73cfc7c254670b7bc8a134.tar.gz | |
Merge branch 'master' into develop
# Conflicts:
# SmartDeviceLink/SDLProxyFactory.m
Diffstat (limited to 'SmartDeviceLink/SDLProxyFactory.m')
| -rw-r--r-- | SmartDeviceLink/SDLProxyFactory.m | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/SmartDeviceLink/SDLProxyFactory.m b/SmartDeviceLink/SDLProxyFactory.m index ddb3e42b0..3a703e073 100644 --- a/SmartDeviceLink/SDLProxyFactory.m +++ b/SmartDeviceLink/SDLProxyFactory.m @@ -3,7 +3,6 @@ #import "SDLProxyFactory.h" -#import "SDLLogMacros.h" #import "SDLIAPTransport.h" #import "SDLProtocol.h" #import "SDLProxy.h" |