Fix a merge error. Still doesn't build.
authorIan Monroe <imonroe@kde.org>
Sun, 7 Feb 2010 17:02:42 +0000 (11:02 -0600)
committerIan Monroe <imonroe@kde.org>
Sun, 7 Feb 2010 17:03:38 +0000 (11:03 -0600)
commit31070280b565d47b7de5947c8a4153d5e88ba0bf
treee2fb1b0f552627f816a61c1eaf66637a4baa7b2d
parentd4ebe3f6b2fbbddff2af0f651d758ac0e1f575b5
Fix a merge error. Still doesn't build.
src/amarokconfig.kcfg