From 618bfebfaff56d56c977f71e16ca961dcf6ecd33 Mon Sep 17 00:00:00 2001 From: Joey Smith Date: Fri, 15 Sep 2000 20:54:42 +0000 Subject: [PATCH] Remove CVS conflict. Zeev, I assume you wanted context inside the globals? --- ext/sybase_ct/php_sybase_ct.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ext/sybase_ct/php_sybase_ct.h b/ext/sybase_ct/php_sybase_ct.h index ed825fc588..23a96ca1e8 100644 --- a/ext/sybase_ct/php_sybase_ct.h +++ b/ext/sybase_ct/php_sybase_ct.h @@ -66,13 +66,8 @@ ZEND_BEGIN_MODULE_GLOBALS(sybase) char *hostname; char *server_message; long min_server_severity, min_client_severity; -<<<<<<< php_sybase_ct.h CS_CONTEXT *context; ZEND_END_MODULE_GLOBALS(sybase) -======= - long cfg_min_server_severity, cfg_min_client_severity; -ZEND_END_MODULE_GLOBALS(sybase) ->>>>>>> 1.7 typedef struct { CS_CONNECTION *connection; -- 2.50.1