From: Mike Jerris <mike@jerris.com>
Date: Tue, 25 Sep 2018 15:22:54 +0000 (+0000)
Subject: FS-11340: [core] fix merge conflict
X-Git-Tag: v1.8.2~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a747db947c961b8a9d469d07f33108dba5299ed9;p=thirdparty%2Ffreeswitch.git

FS-11340: [core] fix merge conflict
---

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";
 	}