merge

2018-11-20 15:36:41 +11:00 · 2018-11-20 15:36:41 +11:00 · 70eca5580d
commit 70eca5580d
parent cd346252cc
1 changed files with 1 additions and 4 deletions
--- a/client/src/scenes/menu.js
+++ b/client/src/scenes/menu.js
@ -8,15 +8,12 @@ class Menu extends Phaser.Scene {
    }

    create() {
-<<<<<<< HEAD
        this.add.text(0, 0, 'cryps.gg', TEXT.HEADER);
-=======
+
        this.scene.sleep('Passives');
-        this.add.text(0, 0, 'cryps.gg',  { fontFamily: 'Arial', fontSize: 24, color: '#ffffff', fontStyle: 'bold' });
        this.input.keyboard.on('keydown_F', () => {
            this.scene.wake('Passives');
        }, 0, this);
->>>>>>> ab0aebc49f285e1f0a71035790e3089eadce25f2
    }
 }