From 3a206071b11a6df8fbd8588c0e2eee56e75ccbc3 Mon Sep 17 00:00:00 2001
From: Lukas W <lukaswhl@gmail.com>
Date: Tue, 25 Nov 2014 01:07:39 +0100
Subject: [PATCH] Fix merge conflicts

---
 plugins/delay/delaycontrols.cpp | 2 --
 src/gui/plugin_browser.cpp      | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/delay/delaycontrols.cpp b/plugins/delay/delaycontrols.cpp
index fb86834c7..938b90f05 100644
--- a/plugins/delay/delaycontrols.cpp
+++ b/plugins/delay/delaycontrols.cpp
@@ -68,5 +68,3 @@ void DelayControls::changeSampleRate()
 {
     m_effect->changeSampleRate();
 }
-
-#include "moc_delaycontrols.cxx"
diff --git a/src/gui/plugin_browser.cpp b/src/gui/plugin_browser.cpp
index 294a67432..b2acfc13b 100644
--- a/src/gui/plugin_browser.cpp
+++ b/src/gui/plugin_browser.cpp
@@ -26,6 +26,7 @@
 #include <QPainter>
 #include <QCursor>
 #include <QMouseEvent>
+#include <QScrollArea>
 
 #include "plugin_browser.h"
 #include "embed.h"