From: David Webster <Dave.Webster@bhmi.com>
Date: Thu, 24 Jan 2002 23:22:26 +0000 (+0000)
Subject: Removed a conflict indicator...
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/59d77e838192d612729e6c8ed2216604b9912077

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 b1edfda733..31e336762b 100644
--- 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