CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:        /cvs
Module name:    ports
Changes by:     es...@cvs.openbsd.org   2013/12/08 08:02:01

Modified files:
        x11/kde4/libs  : Makefile 
        x11/kde4/libs/pkg: PLIST-en_US PLIST-langlist 

Log message:
fix bogus conflict markers, allow update past the split by making sure
the conflict matches the last package before the split.