yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge...

Browse source
This commit is contained in:
Thomas Lübking 2013-03-05 19:30:42 +01:00
parent 049cb66b22
commit 4999b12387
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client.cpp
View file

@ -1519,10 +1519,7 @@ void Client::setOnActivity(const QString &activity, bool enable)
/**
* set exactly which activities this client is on
*/
<<<<<<< HEAD
// cloned from kactivities/src/lib/core/consumer.cpp
=======
>>>>>>> Map NULL_UUID activity to ALL activities
#define NULL_UUID "00000000-0000-0000-0000-000000000000"
void Client::setOnActivities(QStringList newActivitiesList)
{