Removed a conflict indicator...
authorDavid Webster <Dave.Webster@bhmi.com>
Thu, 24 Jan 2002 23:22:26 +0000 (23:22 +0000)
committerDavid Webster <Dave.Webster@bhmi.com>
Thu, 24 Jan 2002 23:22:26 +0000 (23:22 +0000)
commit59d77e838192d612729e6c8ed2216604b9912077
treee3bd661b55a8e59cf6519362da9b93ab84148937
parent2fe57169b5bb211fe5c857bd71a0d547c27a1a9b
Removed a conflict indicator...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
src/common/gdicmn.cpp