X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2fe57169b5bb211fe5c857bd71a0d547c27a1a9b..221ed5767f7ef4d51b0bbef50ec9f53edfaa46f2:/src/common/gdicmn.cpp

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