From ac0880fd8f5212d81e9a0810ad0a4f32b077d81f Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Wed, 11 Oct 2000 18:00:18 +0000 Subject: [PATCH] Remove conflict --- ext/pgsql/pgsql.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 0ccc2c0e2d..24deb708be 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -425,12 +425,7 @@ void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) PGG(num_links)++; } efree(hashed_details); -<<<<<<< pgsql.c php_pgsql_set_default_link(return_value->value.lval); -======= - PGG(default_link)=return_value->value.lval; - zend_list_addref(return_value->value.lval); ->>>>>>> 1.63 } -- 2.50.1