Author: mikej Date: Wed Jan 23 13:42:49 2008 New Revision: 7329 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_global_log.c Log: merge conflict fix Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_global_log.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_global_log.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_global_log.c Wed Jan 23 13:42:49 2008 @@ -48,7 +48,6 @@ * * @sa <sofia-sip/su_debug.h>, su_log_global */ -#ifdef DOXYGEN extern char const SU_DEBUG[]; #endif