From 70eca5580d04c20fa768bb673004fc125c11630e Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Tue, 20 Nov 2018 15:36:41 +1100
Subject: [PATCH] merge

---
 client/src/scenes/menu.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/src/scenes/menu.js b/client/src/scenes/menu.js
index fa84c9b1..be909914 100755
--- 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
     }
 }