Robin Dunn 35eca07ccd Removed a ">>>>>>> 1.5" (a CVS conflict indicator) that got left in ... the code. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775		1998-08-07 17:32:54 +00:00
..
wx	Removed a ">>>>>>> 1.5" (a CVS conflict indicator) that got left in	1998-08-07 17:32:54 +00:00