From a747db947c961b8a9d469d07f33108dba5299ed9 Mon Sep 17 00:00:00 2001 From: Mike Jerris Date: Tue, 25 Sep 2018 15:22:54 +0000 Subject: [PATCH] FS-11340: [core] fix merge conflict --- src/switch_vad.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/switch_vad.c b/src/switch_vad.c index b71963052e..1608a33543 100644 --- a/src/switch_vad.c +++ b/src/switch_vad.c @@ -60,14 +60,14 @@ struct switch_vad_s { SWITCH_DECLARE(const char *) switch_vad_state2str(switch_vad_state_t state) { switch(state) { - case SWITCH_VAD_STATE_NONE: return "none"; + case SWITCH_VAD_STATE_NONE: return "none"; - case SWITCH_VAD_STATE_START_TALKING: return "start_talking"; - return "start-talking"; - case SWITCH_VAD_STATE_TALKING: return "talking"; + case SWITCH_VAD_STATE_START_TALKING: + return "start_talking"; + case SWITCH_VAD_STATE_TALKING: return "talking"; - case SWITCH_VAD_STATE_STOP_TALKING: return "stop_talking"; - return "stop-talking"; + case SWITCH_VAD_STATE_STOP_TALKING: + return "stop_talking"; default: return "error"; }