From 84ee3b585c3393a2b45115dc8b2eb0df410b3c80 Mon Sep 17 00:00:00 2001
From: Pieter van der Kloet <pvdkloet@gmail.com>
Date: Mon, 25 Apr 2011 06:08:05 +0200
Subject: [PATCH] Added ability to get the previous profile when a new one is
 selected

---
 apps/launcher/datafilespage.hpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/launcher/datafilespage.hpp b/apps/launcher/datafilespage.hpp
index 524382f2b..61a8ca06e 100644
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@@ -30,11 +30,7 @@ public slots:
     void masterSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
     void setCheckstate(QModelIndex index);
     void resizeRows();
-<<<<<<< HEAD
     void profileChanged(const QString &current, const QString &previous);
-=======
-    void profileChanged(const QString &profile);
->>>>>>> 766e3f6... Added combobox slot for changing the profile
 
 private:
     QTableWidget *mMastersWidget;