From 33925b2fd15a1d6e25111634559bd8386edc9aaa Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 26 Oct 2018 15:57:57 +0200
Subject: [PATCH] fix after merge conflict error

---
 src/components/structures/LeftPanel.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index a3b28d94ee..b839612338 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -181,6 +181,8 @@ var LeftPanel = React.createClass({
         const TopLeftMenuButton = sdk.getComponent('structures.TopLeftMenuButton');
         const BottomLeftMenu = sdk.getComponent('structures.BottomLeftMenu');
         const CallPreview = sdk.getComponent('voip.CallPreview');
+
+        let topBox = <TopLeftMenuButton collapsed={ this.props.collapsed }/>;
 /*
         const SearchBox = sdk.getComponent('structures.SearchBox');
         const topBox = <SearchBox collapsed={ this.props.collapsed } onSearch={ this.onSearch } />;