oops... conflict removed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 0f30a9e562502016902a98b240dc1bed1d8e2ef3..1ec43bfa0a0178e85112f1bcbcf2344fe439decd 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -112,23 +112,9 @@ static inline bool IsLoggingEnabled()
 // generic log function
 void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
 {
 // generic log function
 void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
 {

-<<<<<<< log.cpp
-  if ( wxLog::GetActiveTarget() != NULL ) {
-    wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
-
-    va_list argptr;
-    va_start(argptr, szFormat);
-    wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
-    va_end(argptr);
-=======

     if ( IsLoggingEnabled() ) {
         wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
     if ( IsLoggingEnabled() ) {
         wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);

->>>>>>> 1.93.2.3

 
 

-<<<<<<< log.cpp
-    wxLog::OnLog(level, s_szBuf, time(NULL));
-  }
-=======

         va_list argptr;
         va_start(argptr, szFormat);
         wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
         va_list argptr;
         va_start(argptr, szFormat);
         wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);


@@ -136,7 +122,6 @@ void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
 
         wxLog::OnLog(level, s_szBuf, time(NULL));
     }
 
         wxLog::OnLog(level, s_szBuf, time(NULL));
     }

->>>>>>> 1.93.2.3

 }
 
 #define IMPLEMENT_LOG_FUNCTION(level)                               \
 }
 
 #define IMPLEMENT_LOG_FUNCTION(level)                               \