From e4f86893a899ee86cfa6d238f891bec04977c966 Mon Sep 17 00:00:00 2001
From: Orochimarufan <orochimarufan.x3@gmail.com>
Date: Fri, 22 Mar 2013 14:40:55 +0100
Subject: fix merge issues, make console window work again

---
 libsettings/src/stubkeyring.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'libsettings/src')

diff --git a/libsettings/src/stubkeyring.h b/libsettings/src/stubkeyring.h
index 0566d5ab..b5f04e4c 100644
--- a/libsettings/src/stubkeyring.h
+++ b/libsettings/src/stubkeyring.h
@@ -24,7 +24,6 @@
 
 class StubKeyring : public Keyring
 {
-	Q_OBJECT
 public:
 	virtual bool storePassword(QString service, QString username, QString password);
 	virtual QString getPassword(QString service, QString username);
-- 
cgit v1.2.3