Removed a conflict indicator...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-24 23:22:26 +00:00
parent 2fe57169b5
commit 59d77e8381
1 changed files with 0 additions and 1 deletions
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -445,7 +445,6 @@ void wxInitializeStockObjects ()
 #if defined(__WXMAC__)
  static const int sizeFont = 12;
  wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL);
-<<<<<<< gdicmn.cpp
 #elif defined(__WXPM__)
  static const int sizeFont = 12;
 #else