From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 27 May 1998 22:50:55 +0000 (+0000)
Subject: no changes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/cdb7168d80d58c0f608b97f323518ebbf7a4bada

no changes


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

diff --git a/include/wx/log.h b/include/wx/log.h
index a484063245..6934ffedf7 100644
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -50,6 +50,7 @@ typedef unsigned long wxTraceMask;
 typedef unsigned long wxLogLevel;
 
 // ----------------------------------------------------------------------------
+>>>>>>> 1.2
 // derive from this class to redirect (or suppress, or ...) log messages
 // normally, only a single instance of this class exists but it's not enforced
 // ----------------------------------------------------------------------------