SrvPalette.c: missed a merge conflict in SrvPalette.c
drwxr-xr-x - cde