Resolve conflicts in src/include/parser/kwlist.h#2549

silent-observer merged 2 commits into

sync-14x-b13arenadata/gpdb:sync-14x-b13from

sync-14x-b13-michkov-3arenadata/gpdb:sync-14x-b13-michkov-3Copy head branch name to clipboard