compilation fix after last commit

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

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 8c405aab049109d14201099ccf52b3b36c04e109..c2e691b4015027267ccfc2fbff59e3f97eed0e23 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -88,27 +88,7 @@
     #define TEST_WCHAR
     #define TEST_ZIP
 #else // #if TEST_ALL
     #define TEST_WCHAR
     #define TEST_ZIP
 #else // #if TEST_ALL

-<<<<<<< console.cpp
-<<<<<<< console.cpp
-<<<<<<< console.cpp
-<<<<<<< console.cpp
-<<<<<<< console.cpp
-    #define TEST_MIME
-=======

     #define TEST_STDPATHS
     #define TEST_STDPATHS

->>>>>>> 1.197
-=======
-    #define TEST_MODULE
->>>>>>> 1.199
-=======
-    #define TEST_INFO_FUNCTIONS
->>>>>>> 1.201
-=======
-    #define TEST_STDPATHS
->>>>>>> 1.203
-=======
-    #define TEST_FILE
->>>>>>> 1.204

 #endif
 
 // some tests are interactive, define this to run them
 #endif
 
 // some tests are interactive, define this to run them