From 9e91a33c46cdf8d8c1ae36d1f81b76272f0acfe8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 15 Feb 2000 09:50:19 +0000
Subject: [PATCH] conflicts markers removed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/event.cpp | 13 -------------
 1 file changed, 13 deletions(-)

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
 }
 
 /*