diff options
author | JackLivio <jack@livio.io> | 2020-08-20 12:39:18 -0400 |
---|---|---|
committer | JackLivio <jack@livio.io> | 2020-08-20 12:39:18 -0400 |
commit | cb97d3e2836a5089dd239626c416513b6b5fface (patch) | |
tree | b83fec03a10d5362e9b7eabb800d3d18cb8f4e0d /src/components/application_manager | |
parent | cbe483cbd195c16e9429038abd9b13f844952208 (diff) | |
download | sdl_core-cb97d3e2836a5089dd239626c416513b6b5fface.tar.gz |
Fix merge conflicts
Diffstat (limited to 'src/components/application_manager')
2 files changed, 2 insertions, 6 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc index a945d7281f..a22fad1d3b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc @@ -933,16 +933,14 @@ CommandCreator& HMICommandFactory::get_creator_factory( case hmi_apis::FunctionID::BasicCommunication_OnAppPropertiesChange: { return factory.GetCreator<commands::OnAppPropertiesChangeNotification>(); } -<<<<<<< HEAD case hmi_apis::FunctionID::UI_OnUpdateFile: { return factory.GetCreator<commands::OnUIUpdateFileNotification>(); } case hmi_apis::FunctionID::UI_OnUpdateSubMenu: { return factory.GetCreator<commands::OnUIUpdateSubMenuNotification>(); -======= + } case hmi_apis::FunctionID::UI_OnSubtleAlertPressed: { return factory.GetCreator<commands::OnUISubtleAlertPressedNotification>(); ->>>>>>> origin/develop } default: { return factory.GetCreator<InvalidCommand>(); } } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc index 98b2fcb74f..a585f4cecf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc @@ -469,16 +469,14 @@ CommandCreator& MobileCommandFactory::get_notification_creator( case mobile_apis::FunctionID::OnWayPointChangeID: { return factory.GetCreator<commands::OnWayPointChangeNotification>(); } -<<<<<<< HEAD case mobile_apis::FunctionID::OnUpdateFileID: { return factory.GetCreator<commands::OnUpdateFileNotification>(); } case mobile_apis::FunctionID::OnUpdateSubMenuID: { return factory.GetCreator<commands::OnUpdateSubMenuNotification>(); -======= + } case mobile_apis::FunctionID::OnSubtleAlertPressedID: { return factory.GetCreator<commands::OnSubtleAlertPressedNotification>(); ->>>>>>> origin/develop } default: {} } |