From b0bbefea738836e3112054528dabc184edc9ba80 Mon Sep 17 00:00:00 2001
From: gmarco <g.marco@freenet.de>
Date: Mon, 27 Jul 2009 20:18:11 +0200
Subject: [PATCH] kdenlivetitle_wrapper.cpp: fixed merge conflict

---
 src/modules/qimage/kdenlivetitle_wrapper.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/modules/qimage/kdenlivetitle_wrapper.cpp b/src/modules/qimage/kdenlivetitle_wrapper.cpp
index f71a73b5..b4eacfe0 100644
--- 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>
-- 
2.39.2