- How did CVS let me commit this? Probably it confused with the branch

  merge

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 053861aadc90425e4806a97ec687a796bd9e47a3..c432b70018f281c59673864599874bf0f7433c7f 100644 (file)
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -211,21 +211,11 @@ static PHP_MSHUTDOWN_FUNCTION(dba)
 static PHP_MINFO_FUNCTION(dba)
 {
        dba_handler *hptr;
-<<<<<<< dba.c
-       static char handlers[80];
-=======
        smart_str handlers = {0};
->>>>>>> 1.28
-
-       handlers[0] = '\0';
 
        for(hptr = handler; hptr->name; hptr++) {
-<<<<<<< dba.c
-               strlcat(handlers, hptr->name, sizeof(handlers));
-=======
                smart_str_appends(&handlers, hptr->name);
                smart_str_appendc(&handlers, ' ');
->>>>>>> 1.28
        }
 
        php_info_print_table_start();