From 35b11e0e61fd3c7130c3f54601ba05dd0b52fba3 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 2 Nov 2015 15:10:46 -0500
Subject: Fix merge issues

---
 web/react/components/tutorial/tutorial_intro_screens.jsx | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'web/react/components/tutorial/tutorial_intro_screens.jsx')

diff --git a/web/react/components/tutorial/tutorial_intro_screens.jsx b/web/react/components/tutorial/tutorial_intro_screens.jsx
index 0f3050156..c7abccae3 100644
--- a/web/react/components/tutorial/tutorial_intro_screens.jsx
+++ b/web/react/components/tutorial/tutorial_intro_screens.jsx
@@ -20,10 +20,6 @@ export default class TutorialIntroScreens extends React.Component {
 
         this.state = {currentScreen: 0};
     }
-    componentDidMount() {
-        const height = $(window).outerHeight() - 120;
-        $('.tutorial-steps__container').css('height', `${height}px`);
-    }
     handleNext() {
         if (this.state.currentScreen < 2) {
             this.setState({currentScreen: this.state.currentScreen + 1});
-- 
cgit v1.2.3-1-g7c22