From 205ed54ec72835e81033b5196335f088b99a81f9 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 7 Jul 2015 03:44:57 +0100
Subject: [PATCH] merge in matthew-css

---
 src/controllers/organisms/RoomView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/organisms/RoomView.js b/src/controllers/organisms/RoomView.js
index a92ee2c672..ccd2469114 100644
--- a/src/controllers/organisms/RoomView.js
+++ b/src/controllers/organisms/RoomView.js
@@ -191,7 +191,7 @@ module.exports = {
             var TileType = tileTypes[mxEv.getType()];
             if (!TileType) continue;
             ret.unshift(
-                <li key={mxEv.getId()}><TileType mxEvent={mxEv} /></li>
+                <TileType key={mxEv.getId()} mxEvent={mxEv} />
             );
             ++count;
         }