From 727ce892de8c23e1dd0ad8239b9bd72291069787 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 7 Jan 2020 15:54:51 -0700
Subject: [PATCH] Fix remaining RoomView conflict

RoomContext was pulled out to its own file.
---
 src/components/structures/RoomView.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 3c311d2b83..a24df775e2 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -66,17 +66,7 @@ if (DEBUG) {
     debuglog = console.log.bind(console);
 }
 
-<<<<<<< HEAD
-export const RoomContext = PropTypes.shape({
-    canReact: PropTypes.bool.isRequired,
-    canReply: PropTypes.bool.isRequired,
-    room: PropTypes.instanceOf(Room),
-});
-
 export default createReactClass({
-=======
-module.exports = createReactClass({
->>>>>>> develop
     displayName: 'RoomView',
     propTypes: {
         ConferenceHandler: PropTypes.any,