From 812f87798432f6b4c1ea3a58fb2d7942e802a4c7 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 9 May 2013 12:37:39 -0700
Subject: [PATCH] resolve conflicts on merge with upstream master

---
 audio-mixer/src/main.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp
index 31da0d5b47..aa8d7a4fee 100644
--- a/audio-mixer/src/main.cpp
+++ b/audio-mixer/src/main.cpp
@@ -78,7 +78,6 @@ void attachNewBufferToAgent(Agent *newAgent) {
 }
 
 int main(int argc, const char* argv[]) {
-    signal(SIGSEGV, printStacktrace);
     setvbuf(stdout, NULL, _IOLBF, 0);
     
     AgentList* agentList = AgentList::createInstance(AGENT_TYPE_AUDIO_MIXER, MIXER_LISTEN_PORT);