matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Fix remaining RoomView conflict

Browse Source 
RoomContext was pulled out to its own file.
This commit is contained in:
Travis Ralston
2020-01-07 15:54:51 -07:00
parent 3e5cc9550b
commit 727ce892de
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/structures/RoomView.js
View File

@@ -66,17 +66,7 @@ if (DEBUG) {
debuglog = console.log.bind(console); 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({ export default createReactClass({
=======
module.exports = createReactClass({
>>>>>>> develop
displayName: 'RoomView', displayName: 'RoomView',
propTypes: { propTypes: {
ConferenceHandler: PropTypes.any, ConferenceHandler: PropTypes.any,