Oops, unfixed merge conflict

2014-11-16 16:08:22 +02:00
parent e62e2f3889
commit c75f4e8dd3
1 changed files with 0 additions and 5 deletions
--- 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;