Fix merge conflicts

This commit is contained in:
Lukas W committed 2014-11-25 01:07:39 +01:00
1 parent 02cbc89f0f
commit 3a206071b1
2 files changed
+1 -2

No files matched your search

-2
View File
@@ -68,5 +68,3 @@ void DelayControls::changeSampleRate()
{
m_effect->changeSampleRate();
}
#include "moc_delaycontrols.cxx"