Commit22bc403

committed

Remove line duplicated during conflict resolution.

I included the duplicated ExecTypeFromTL in578b229 "Remove WITH OIDSsupport".Reported-By: Peter EisentrautDiscussion:https://postgr.es/m/ba819888-63c6-7f98-6acb-3731142d9414@2ndquadrant.com

1 parent93b5cc0 commit22bc403Copy full SHA for 22bc403

File tree

-1

lines changed

-1

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1604,7 +1604,6 @@ ExecInitResultTypeTL(PlanState *planstate)`
`1604`	`1604`	`{`
`1605`	`1605`	`TupleDesctupDesc=ExecTypeFromTL(planstate->plan->targetlist);`
`1606`	`1606`
`1607`		`-tupDesc=ExecTypeFromTL(planstate->plan->targetlist);`
`1608`	`1607`	`planstate->ps_ResultTupleDesc=tupDesc;`
`1609`	`1608`	`}`
`1610`	`1609`

Comments

(0)