From d272c2e7250799fa83d8bc6b8edd341bc104a663 Mon Sep 17 00:00:00 2001 From: auria Date: Thu, 17 Mar 2011 00:07:07 +0000 Subject: [PATCH] Fixed merging glitch git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7959 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/states_screens/race_gui.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/states_screens/race_gui.cpp b/src/states_screens/race_gui.cpp index 33d430af0..886ec73d7 100644 --- a/src/states_screens/race_gui.cpp +++ b/src/states_screens/race_gui.cpp @@ -54,9 +54,6 @@ using namespace irr; #else #include #endif -#else -#include -#endif /** The constructor is called before anything is attached to the scene node. * So rendering to a texture can be done here. But world is not yet fully