Fix merge

2018-01-08 14:35:39 +00:00 · 2018-01-08 14:35:39 +00:00 · b6c002b587
parent 9c3e4a1202
commit b6c002b587
1 changed files with 0 additions and 2 deletions
--- a/src/components/views/messages/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@ -29,8 +29,6 @@ module.exports = React.createClass({
    render: function() {
        const date = new Date(this.props.ts);
        return (
-            <span className="mx_MessageTimestamp">
-                { DateUtils.formatTime(date)+'&nbsp;' }
            <span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date, this.props.showTwelveHour) }>
                { DateUtils.formatTime(date, this.props.showTwelveHour) + '&nbsp;' }
            </span>