Remove conflict

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 0ccc2c0e2d1e7a376378859855d1682c8b3adead..24deb708be7c9e031e076a05d62ec8024ec418b4 100644 (file)
--- 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
 }