Thread: pgsql: Fixed conflicting commit.

pgsql: Fixed conflicting commit.

From
meskes@postgresql.org (Michael Meskes)
Date:
Log Message:
-----------
Fixed conflicting commit.

Tags:
----
REL8_3_STABLE

Modified Files:
--------------
    pgsql/src/interfaces/ecpg/preproc:
        pgc.l (r1.159.2.1 -> r1.159.2.2)
        (http://developer.postgresql.org/cvsweb.cgi/pgsql/src/interfaces/ecpg/preproc/pgc.l?r1=1.159.2.1&r2=1.159.2.2)