1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-04 05:07:27 +02:00

Fix merge issue

This commit is contained in:
Jeff Mitchell
2012-03-14 16:31:20 -04:00
parent 6c6411561b
commit 042ccbe730

View File

@@ -16,7 +16,7 @@ public:
~TomahawkOAuthTwitter() {} ~TomahawkOAuthTwitter() {}
protected: protected:
virtual int authorizationWidget(); virtual const QString authorizationWidget();
private slots: private slots:
void error(); void error();