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

no changes (cvs wierdness...)


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

diff --git a/include/wx/log.h b/include/wx/log.h
index 6934ffedf7..a484063245 100644
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -50,7 +50,6 @@ 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
 // ----------------------------------------------------------------------------