matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-11 20:22:36 +03:00
Code Activity

Fix broken merge

Browse Source 
I messed up the merge in 6dd46d5.
This commit is contained in:
Richard van der Hoff
2017-01-24 20:55:10 +00:00
parent 6dd46d532a
commit 72492fd909
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/rooms/RoomHeader.js
View File

@@ -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;