Fix broken merge

I messed up the merge in 6dd46d5.
2017-01-24 20:55:10 +00:00 · 2017-01-24 20:55:10 +00:00 · 72492fd909
parent 6dd46d532a
commit 72492fd909
1 changed files with 1 additions and 5 deletions
--- 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;