From b6c002b587b0bb45798973f319427204d1259ef0 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Mon, 8 Jan 2018 14:35:39 +0000
Subject: [PATCH] Fix merge

---
 src/components/views/messages/MessageTimestamp.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js
index c802f119..f5968a68 100644
--- 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>