Fixed merging glitch

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7959 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-03-17 00:07:07 +00:00 · 2011-03-17 00:07:07 +00:00 · d272c2e725
commit d272c2e725
parent b3fc0ed2cd
1 changed files with 0 additions and 3 deletions
--- a/src/states_screens/race_gui.cpp
+++ b/src/states_screens/race_gui.cpp
@ -54,9 +54,6 @@ using namespace irr;
 #else
 #include <GL/gl.h>
 #endif
-#else
-#include <GL/gl.h>
-#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