fixed merge conflict

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

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index b96a9bfbf195ca86dc246cdb45677d0107bab9fb..a670ac54d0fe926bc521564a8d8981a918533feb 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -179,8 +179,8 @@ record operations on a DC and then play them back later.
 Upgraded to Scintilla 1.70 for wx.stc.StyledTextCtrl.
 
 Added CanSetTransparent and SetTransparent methods to the
 Upgraded to Scintilla 1.70 for wx.stc.StyledTextCtrl.
 
 Added CanSetTransparent and SetTransparent methods to the

-wx.TopLevelWindow class.
-
+wx.TopLevelWindow class, with implementations (so far) for wxMSW and
+wxMac.