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
 // ----------------------------------------------------------------------------