Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed a conflict indicator...

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-01-24 23:22:26 +00:00
parent 2fe57169b5
commit 59d77e8381
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/gdicmn.cpp
View File

@@ -445,7 +445,6 @@ void wxInitializeStockObjects ()
#if defined(__WXMAC__) #if defined(__WXMAC__)
static const int sizeFont = 12; static const int sizeFont = 12;
wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL); wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL);
<<<<<<< gdicmn.cpp
#elif defined(__WXPM__) #elif defined(__WXPM__)
static const int sizeFont = 12; static const int sizeFont = 12;
#else #else