From 72492fd909bca2691fe7f21763aab64c571982f5 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 24 Jan 2017 20:55:10 +0000
Subject: [PATCH] Fix broken merge

I messed up the merge in 6dd46d5.
---
 src/components/views/rooms/RoomHeader.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 0593ba16e9..812dd8c79c 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -302,11 +302,7 @@ module.exports = React.createClass({
             rightPanel_buttons =
                 <AccessibleButton className="mx_RoomHeader_button" onClick={this.onShowRhsClick} title="<">
                     <TintableSvg src="img/minimise.svg" width="10" height="16"/>
-<<<<<<< HEAD
-                </AccessibleButton>
-=======
-                </div>;
->>>>>>> origin/develop
+                </AccessibleButton>;
         }
 
         var right_row;