From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 7 Jan 2011 22:14:31 +0000 (+0000)
Subject: correcting merge conflict
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/38c69d200d4ae691a04f1b7d7a107d4c306b3ae0

correcting merge conflict

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

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 7c539e35ac..aa0ed91bf8 100644
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -155,15 +155,6 @@ const wxMenuInfoHelperList& wxMenuBarBase::GetMenuInfos() const
 
 #endif
 
-wxBEGIN_PROPERTIES_TABLE(wxMenuBar)
-wxPROPERTY_COLLECTION( MenuInfos, wxMenuInfoList, wxMenuInfo*, AppendMenuInfo, \
-                      GetMenuInfos, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxMenuBar)
-
-wxCONSTRUCTOR_DUMMY( wxMenuBar )
-
 // ----------------------------------------------------------------------------
 // XTI for wxMenuItem
 // ----------------------------------------------------------------------------