Commit b5439846 authored by George Goldberg's avatar George Goldberg
Browse files

Fix bad merge.

parent 999628aa
...@@ -4,11 +4,8 @@ ...@@ -4,11 +4,8 @@
import React from 'react'; import React from 'react';
import {FormattedMessage} from 'react-intl'; import {FormattedMessage} from 'react-intl';
import * as Utils from 'utils/utils.jsx';
import AdminSettings from './admin_settings.jsx'; import AdminSettings from './admin_settings.jsx';
import BooleanSetting from './boolean_setting.jsx'; import BooleanSetting from './boolean_setting.jsx';
import DropdownSetting from './dropdown_setting.jsx';
import SettingsGroup from './settings_group.jsx'; import SettingsGroup from './settings_group.jsx';
export default class CustomEmojiSettings extends AdminSettings { export default class CustomEmojiSettings extends AdminSettings {
......
...@@ -21,8 +21,8 @@ export default class EmojiPage extends React.Component { ...@@ -21,8 +21,8 @@ export default class EmojiPage extends React.Component {
siteName: PropTypes.string, siteName: PropTypes.string,
scrollToTop: PropTypes.func.isRequired, scrollToTop: PropTypes.func.isRequired,
actions: PropTypes.shape({ actions: PropTypes.shape({
loadRolesIfNeeded: PropTypes.func.isRequired loadRolesIfNeeded: PropTypes.func.isRequired,
}).isRequired }).isRequired,
} }
static defaultProps = { static defaultProps = {
......
...@@ -10869,7 +10869,7 @@ ...@@ -10869,7 +10869,7 @@
"dev": true "dev": true
}, },
"mattermost-redux": { "mattermost-redux": {
"version": "github:mattermost/mattermost-redux#15261d20e735bc09b0e8ef64a66b3fe4996715e5", "version": "github:mattermost/mattermost-redux#65871294964d427e3c4e59860a0fd0c369317709",
"from": "github:mattermost/mattermost-redux#advanced-permissions-phase-2", "from": "github:mattermost/mattermost-redux#advanced-permissions-phase-2",
"requires": { "requires": {
"deep-equal": "1.0.1", "deep-equal": "1.0.1",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment