X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23f681ec4840b44e265e6f71beef5a242306220b..5c8fc7c1debd3d2a58c015132f2a3d9e3e26cd38:/src/common/event.cpp

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 8843bd11c8..d770701860 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -205,19 +205,6 @@ wxScrollEvent::wxScrollEvent(wxEventType commandType,
 {
     m_extraLong = orient;
     m_commandInt = pos;
-<<<<<<< event.cpp
-    m_isScrolling = TRUE;
-}
-
-void wxScrollEvent::CopyObject(wxObject& obj_d) const
-{
-    wxScrollEvent *obj = (wxScrollEvent*)&obj_d;
-
-    wxCommandEvent::CopyObject(obj_d);
-
-    obj->m_isScrolling  = m_isScrolling;
-=======
->>>>>>> 1.69
 }
 
 /*