fixing merge

This commit is contained in:
Andre Antunes 2011-04-07 05:48:10 -03:00
parent 67f37ccb51
commit ee2b05dc8d
1 changed files with 1 additions and 4 deletions

View File

@ -108,7 +108,6 @@ void Engine::run()
// swap buffers
Platform::swapBuffers();
<<<<<<< HEAD
/*
static ConnectionPtr connection = g_connections.createConnection();
@ -127,9 +126,7 @@ void Engine::run()
}
*/
//}
=======
}
>>>>>>> f3eaf3f7262bf6ef35cee745d40088669526125a
}
m_stopping = false;