Removed a conflict indicator...

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index b1edfda733f117e217ccf304f114dfc5fcb02f22..31e336762b553f90bd731db0a46fcaae627ed9e4 100644 (file)
--- 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