corrections to the wxEditableListBox patch, removed conflict indicator checked in...

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

diff --git a/contrib/src/gizmos/editlbox.cpp b/contrib/src/gizmos/editlbox.cpp
index 0c40600798fbeb307237e5ec485f091030268c78..c9ea5ae993071baf7ee5bc9ac0be250183714296 100644 (file)
--- a/contrib/src/gizmos/editlbox.cpp
+++ b/contrib/src/gizmos/editlbox.cpp
@@ -111,13 +111,9 @@ wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
                           const wxString& name)
    : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL, name), m_edittingNew(FALSE)
 {
-<<<<<<< editlbox.cpp
     m_style = style;
     m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL;    
 
-=======
-    m_style = style;
->>>>>>> 1.10
     wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
 
     wxPanel *subp = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize,