Browse files

resolution conflit

  • Loading branch information...
1 parent d5699bf commit a00d52ec4b62739b5ff986512d3413e21dda28bf unknown committed Oct 29, 2011
Showing with 4 additions and 12 deletions.
  1. +4 −12 client/js/Player.js
View
16 client/js/Player.js
@@ -37,18 +37,10 @@ var Player = function(data)
this.addShoot = function()
{
-<<<<<<< HEAD
- //we may need a 'Shoot' or 'Bullet' class at some point, but not for now
- var shoot = new ShootModel(this);
- this.shoots.push(shoot);
- game.lastShotTime = Date.now();
- return shoot;
-=======
- //we may need a 'Shoot' or 'Bullet' class at some point, but not for now
- var shoot = new ShootModel(this);
- this.shoots.push(shoot);
- return shoot;
->>>>>>> 015cee758ba76ec7b18ebfdcba1e3f1d9a46f4dd
+ //we may need a 'Shoot' or 'Bullet' class at some point, but not for now
+ var shoot = new ShootModel(this);
+ this.shoots.push(shoot);
+ return shoot;
}
// gestion des projectiles

0 comments on commit a00d52e

Please sign in to comment.