From 3feceb97b39f3f92eed9d483dba450b30ef84d39 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 1 Feb 2011 16:51:20 +0100
Subject: fix

---
 src/fbgui.pro | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/fbgui.pro')

diff --git a/src/fbgui.pro b/src/fbgui.pro
index 5a4deea..551941b 100644
--- a/src/fbgui.pro
+++ b/src/fbgui.pro
@@ -6,18 +6,12 @@ QT += core \
     gui \
     webkit \
     network
-<<<<<<< HEAD
-HEADERS += fbbrowser.h \
-	   downloadmanager.h
-SOURCES += fbgui.cpp \
-    fbbrowser.cpp \
-    downloadmanager.cpp
-=======
 HEADERS += jsObject.h \
-    fbbrowser.h
+	   downloadmanager.h \
+    	   fbbrowser.h
 SOURCES += jsObject.cpp \
     fbgui.cpp \
+    downloadmanager.cpp \
     fbbrowser.cpp
->>>>>>> a1c5fea9ed618b296548560d5806d99448cca262
 FORMS += fbbrowser.ui
 RESOURCES += fbgui.qrc
-- 
cgit v1.2.3-55-g7522