From 04b2d175aa9ae156b280dc62a7477eccfcdb0c4e Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sun, 26 Jan 2020 12:22:09 -0700 Subject: [PATCH] SrvPalette.c: missed a merge conflict in SrvPalette.c --- cde/programs/dtsession/SrvPalette.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/cde/programs/dtsession/SrvPalette.c b/cde/programs/dtsession/SrvPalette.c index f75b6929..4d6ea8a2 100644 --- a/cde/programs/dtsession/SrvPalette.c +++ b/cde/programs/dtsession/SrvPalette.c @@ -613,13 +613,6 @@ CheckMonitor( (struct _palette *) SRV_MALLOC( sizeof(struct _palette) + 1 ); /* allocate enough space for the name */ -<<<<<<< HEAD - strcpy(tmpPalette, pColorSrvRsrc.MonochromePalette); - for (token1=tmpPalette; *token1; token1++); - while (token1!=tmpPalette && *token1!='.') token1--; - if (!strcmp(token1,PALETTE_SUFFIX)) *token1 = '\0'; - colorSrv.pCurrentPalette[screen_number]->name = -======= snprintf(tmpPalette, SRVBUFSIZE, "%s", pColorSrvRsrc.MonochromePalette); for (token1=tmpPalette; *token1; token1++) @@ -629,7 +622,6 @@ CheckMonitor( if (!strcmp(token1, PALETTE_SUFFIX)) *token1 = '\0'; colorSrv.pCurrentPalette[screen_number]->name = ->>>>>>> master (char *)SRV_MALLOC(strlen(tmpPalette) + 1); strcpy(colorSrv.pCurrentPalette[screen_number]->name, (char *) tmpPalette); -- 2.25.1