From: Robert Roebling <robert@roebling.de>
Date: Wed, 13 Jan 1999 00:44:31 +0000 (+0000)
Subject:   Forgot one.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2545db41337adec4115805f156baa13036c0e73a

  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 382979d4e2..ce48fb032c 100644
--- 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 );
 }