SrvPalette.c: missed a merge conflict in SrvPalette.c
authorJon Trulson <jon@radscan.com>
Sun, 26 Jan 2020 19:22:09 +0000 (12:22 -0700)
committerJon Trulson <jon@radscan.com>
Sun, 26 Jan 2020 19:22:09 +0000 (12:22 -0700)
commit04b2d175aa9ae156b280dc62a7477eccfcdb0c4e
tree79124f047f435958bda57cb3f1f59a81c344f816
parent313b4a8e0b72f7ae63baa9756f09d596d5af4d57
SrvPalette.c: missed a merge conflict in SrvPalette.c
cde/programs/dtsession/SrvPalette.c