From 04bc42a5c74ec0564f413e81064186228d1ff3c3 Mon Sep 17 00:00:00 2001
From: Pieter van der Kloet <pvdkloet@gmail.com>
Date: Sun, 24 Apr 2011 23:29:32 +0200
Subject: [PATCH] Added combobox slot for changing the profile

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

diff --git a/apps/launcher/datafilespage.hpp b/apps/launcher/datafilespage.hpp
index 61a8ca06e1..524382f2ba 100644
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@@ -30,7 +30,11 @@ 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;