Fabio Erculiani 2995a70a7e Revert "[entropy.client.interfaces.dep] drop auto-conflict feature, does more harm than good (kde-4.6.4)" ...

This reverts commit 253fb20744.

2011-06-18 19:49:29 +02:00

..

entropy

Revert "[entropy.client.interfaces.dep] drop auto-conflict feature, does more harm than good (kde-4.6.4)"

2011-06-18 19:49:29 +02:00

tests

[tests] client: fix Trigger unit tests

2011-06-17 22:48:22 +02:00