Conflict correction
authorJulian Smart <julian@anthemion.co.uk>
Wed, 14 Nov 2007 14:51:00 +0000 (14:51 +0000)
committerJulian Smart <julian@anthemion.co.uk>
Wed, 14 Nov 2007 14:51:00 +0000 (14:51 +0000)
commit6aff27c9f17300af3f9272f9ebe43a6aae2807d3
treea2f0b4aeace3e63fd13a55c9c4ea2b2482414a85
parent3e4b352f6b947e65deb816cd508d3be38b37b8fe
Conflict correction

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
include/wx/msw/radiobut.h