1 files changed, 2 insertions, 7 deletions

diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index 71cdea8..9d58383 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -195,18 +195,13 @@ void FunctionKeyboard::loadDefaults() {
 }
 
 /* FunctionKeyboardConfig {{{1 */
 
-<<<<<<< function_keyboard.cpp
-FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) :
-    ProfileDialogKeyWidget(name, parent),
+FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na )
+    : ProfileDialogKeyWidget(name, parent, na), 
     selectedRow(0), selectedCol(0) 
 {
-=======
-FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na )
-    : ProfileDialogKeyWidget(name, parent, na) {
     qWarning("FunctionKeyboardConfig");
->>>>>>> 1.11
 
 
     kb = new FunctionKeyboard(this);
     connect (kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)),