From 153015f77060f6b7fcc258454f0cc8fe920bab14 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Wed, 23 Jan 2008 18:42:49 +0000
Subject: [PATCH] merge conflict fix

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7329 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 libs/sofia-sip/libsofia-sip-ua/su/su_global_log.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_global_log.c b/libs/sofia-sip/libsofia-sip-ua/su/su_global_log.c
index 144c7f48ff..afee739954 100644
--- a/libs/sofia-sip/libsofia-sip-ua/su/su_global_log.c
+++ b/libs/sofia-sip/libsofia-sip-ua/su/su_global_log.c
@@ -48,7 +48,6 @@
  * 
  * @sa <sofia-sip/su_debug.h>, su_log_global
  */
-#ifdef DOXYGEN
 extern char const SU_DEBUG[];
 #endif