kdenlivetitle_wrapper.cpp: fixed merge conflict

diff --git a/src/modules/qimage/kdenlivetitle_wrapper.cpp b/src/modules/qimage/kdenlivetitle_wrapper.cpp
index f71a73b526485803be1e85e4991923678b80de91..b4eacfe0d6e3d01bac32f4282d7996ab7390e5d4 100644 (file)
--- a/src/modules/qimage/kdenlivetitle_wrapper.cpp
+++ b/src/modules/qimage/kdenlivetitle_wrapper.cpp
@@ -22,11 +22,7 @@
 
 #include <QtGui/QImage>
 #include <QtGui/QPainter>
-<<<<<<< HEAD:src/modules/qimage/kdenlivetitle_wrapper.cpp
-#include <QtCore/QCoreApplication>
-=======
 #include <QtCore/QDebug>
->>>>>>> jbm/kdenlivetitle:src/modules/qimage/kdenlivetitle_wrapper.cpp
 #include <QtGui/QApplication>
 #include <QtCore/QFile>
 #include <QtGui/QGraphicsScene>