From c75f4e8dd360ffb37e0ac3ccd0de5fcf6e51c63c Mon Sep 17 00:00:00 2001
From: Vesa <contact.diizy@nbl.fi>
Date: Sun, 16 Nov 2014 16:08:22 +0200
Subject: [PATCH] Oops, unfixed merge conflict

---
 include/FxMixer.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/include/FxMixer.h b/include/FxMixer.h
index f1ac405d0..be1d2486e 100644
--- a/include/FxMixer.h
+++ b/include/FxMixer.h
@@ -202,13 +202,8 @@ private:
 	void allocateChannelsTo(int num);
 	QMutex m_sendsMutex;
 
-<<<<<<< HEAD
-	void addChannelLeaf( FxChannel * ch, sampleFrame * buf );
-
 	int m_lastSoloed;
 
-=======
->>>>>>> stable-1.1
 	friend class MixerWorkerThread;
 	friend class FxMixerView;