diff options
| author | Zeev Suraski <zeev@php.net> | 2000-10-11 18:00:18 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-10-11 18:00:18 +0000 |
| commit | ac0880fd8f5212d81e9a0810ad0a4f32b077d81f (patch) | |
| tree | 0d558c0ebdbd6c4067b5e6c953f36247d29dbe86 | |
| parent | f3232e99c3ab47c195a960c7fd2500f7f370bc5f (diff) | |
| download | php-git-ac0880fd8f5212d81e9a0810ad0a4f32b077d81f.tar.gz | |
Remove conflict
| -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 } |