Forgot one.

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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 382979d4e2f7d1c3fe06144de76fac28299279e7..ce48fb032ce459e9644e95822cdac1cf79575e2e 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -140,12 +140,8 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
   dc.SetBrush( wxBrush( "orange", wxSOLID ) );
   dc.SetPen( *wxWHITE_PEN );
   dc.DrawRectangle( 150, 120, 100, 100 );
-<<<<<<< image.cpp
 #endif
-  
-=======
 
->>>>>>> 1.11
   if (my_horse->Ok()) dc.DrawBitmap( *my_horse, 30, 240 );
 }