Fix merge conflicts

2014-11-25 01:07:39 +01:00
parent 02cbc89f0f
commit 3a206071b1
2 changed files with 1 additions and 2 deletions
--- a/plugins/delay/delaycontrols.cpp
+++ b/plugins/delay/delaycontrols.cpp
@@ -68,5 +68,3 @@ void DelayControls::changeSampleRate()
 {
    m_effect->changeSampleRate();
 }
-
-#include "moc_delaycontrols.cxx"