imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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 = rightPanel_buttons =
<AccessibleButton className="mx_RoomHeader_button" onClick={this.onShowRhsClick} title="<"> <AccessibleButton className="mx_RoomHeader_button" onClick={this.onShowRhsClick} title="<">
<TintableSvg src="img/minimise.svg" width="10" height="16"/> <TintableSvg src="img/minimise.svg" width="10" height="16"/>
<<<<<<< HEAD </AccessibleButton>;
</AccessibleButton>
=======
</div>;
>>>>>>> origin/develop
} }
var right_row; var right_row;