SrvPalette.c: missed a merge conflict in SrvPalette.c

diff --git a/cde/programs/dtsession/SrvPalette.c b/cde/programs/dtsession/SrvPalette.c
index f75b69296955091a68b4146ee1b0b438bf59fcfc..4d6ea8a276c0a24e426f65effe91f1c6cfb0a979 100644 (file)
--- 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);