FS-11340: [core] fix merge conflict

diff --git a/src/switch_vad.c b/src/switch_vad.c
index b71963052ec6b942af0c4cd4f5811a989da17000..1608a335432c6ad3923bdb1cc2ff4c01de020a48 100644 (file)
--- 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";
        }