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 6934ffedf7aa3a077ce3ebff71ffc4e606621085..a4840632454c08f472d85ae952b30cff0683b232 100644 (file)
--- 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
 // ----------------------------------------------------------------------------