merge conflict fix

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7329 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-01-23 18:42:49 +00:00
parent da29143b60
commit 153015f770

View File

@ -48,7 +48,6 @@
* *
* @sa <sofia-sip/su_debug.h>, su_log_global * @sa <sofia-sip/su_debug.h>, su_log_global
*/ */
#ifdef DOXYGEN
extern char const SU_DEBUG[]; extern char const SU_DEBUG[];
#endif #endif