build: Fix conflicts from pointer configuration#1950

kyleconroy merged 1 commit intomainsqlc-dev/sqlc:mainfrom

kyle/fix-emit-null-pointerssqlc-dev/sqlc:kyle/fix-emit-null-pointersCopy head branch name to clipboard