Permalink
Browse files

bla

bla bla
  • Loading branch information...
1 parent 6b5c48b commit 70d7da7020a8e9c157ba99db4a917dbb152dde95 Mohed committed May 5, 2012
Showing with 2 additions and 6 deletions.
  1. +2 −6 skeleton.cpp
View
@@ -135,13 +135,9 @@ void Update()
;
if( keystate[SDLK_q] )
- ;
-<<<<<<< HEAD
-
+ ;
Rotate();
-=======
- //Rotate();
->>>>>>> 8b60e15e3780d0d68c7f09568de82d3747957c61
+
}
void Rotate()
{

0 comments on commit 70d7da7

Please sign in to comment.