SVN commit 6947 by makc: Remove old entries from CONFLICTS, no reason to keep them for ages. M +0 -2 deskutils/kdepim4-runtime/Makefile M +0 -2 deskutils/kdepimlibs4/Makefile M +1 -1 devel/kdesdk4/Makefile M +0 -1 multimedia/kdemultimedia4/Makefile M +0 -2 x11/kdebase4-workspace/Makefile