From ddd94f80a7356a72476a4d3f32c34eab2fa417a2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 12 Nov 2006 19:55:19 +0000 Subject: [PATCH] compilation fix after last commit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/console/console.cpp | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/samples/console/console.cpp b/samples/console/console.cpp index 8c405aab04..c2e691b401 100644 --- a/samples/console/console.cpp +++ b/samples/console/console.cpp @@ -88,27 +88,7 @@ #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 ->>>>>>> 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 -- 2.45.2