jestem dzięciołem

scripts/game/game.js

@@ -436,11 +436,7 @@ playState.prototype = {
 // The first two arguments are the width and the height of the canvas element. In this case 640 x 480 pixels. You can resize this in the gameProperties object above.
 // The third argument is the renderer that will be used. Phaser.AUTO is used to automatically detect whether to use the WebGL or Canvas renderer.
 // The fourth argument is 'gameDiv', which is the id of the DOM element we used above in the index.html file where the canvas element is inserted.
-<<<<<<< ea3fb5d9eafe80441a500bb00cd16728b3a66b3a
-window.createGame = function(scope, players, mapIdm, injector){
-=======
 window.createGame = function(scope, players, mapId, injector){
->>>>>>> new player info
 
   game = new Phaser.Game(gameProperties.screenWidth, gameProperties.screenHeight, Phaser.AUTO, 'gameDiv');