Removed a ">>>>>>> 1.5" (a CVS conflict indicator) that got left in

the code. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-08-07 17:32:54 +00:00
parent b5279053f6
commit 35eca07ccd
1 changed files with 4 additions and 5 deletions
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -156,7 +156,6 @@ public:
  void OnSetFocus(wxFocusEvent& event);
  void OnNavigationKey(wxNavigationKeyEvent& event);

->>>>>>> 1.5
  // base class virtuals
  // -------------------
  virtual void Command(wxCommandEvent& event);