Remove line duplicated during conflict resolution.

I included the duplicated ExecTypeFromTL in 578b2297 "Remove WITH OIDS
support".

Reported-By: Peter Eisentraut
Discussion: https://postgr.es/m/ba819888-63c6-7f98-6acb-3731142d9414@2ndquadrant.com

diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index bc5a5249448058579bb31d8aef31a375956a8d9c..8674b3dcf70c1d7f429b6cad26d1491c4d24c6bf 100644 (file)
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -1604,7 +1604,6 @@ ExecInitResultTypeTL(PlanState *planstate)
 {
        TupleDesc       tupDesc = ExecTypeFromTL(planstate->plan->targetlist);
 
-       tupDesc = ExecTypeFromTL(planstate->plan->targetlist);
        planstate->ps_ResultTupleDesc = tupDesc;
 }