diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/pgsql/pgsql.c | 5 |
1 files changed, 0 insertions, 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 } |