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

Fix bad merge.

parent 999628aa
......@@ -4,11 +4,8 @@
import React from 'react';
import {FormattedMessage} from 'react-intl';
import * as Utils from 'utils/utils.jsx';
import AdminSettings from './admin_settings.jsx';
import BooleanSetting from './boolean_setting.jsx';
import DropdownSetting from './dropdown_setting.jsx';
import SettingsGroup from './settings_group.jsx';
export default class CustomEmojiSettings extends AdminSettings {
......
......@@ -21,8 +21,8 @@ export default class EmojiPage extends React.Component {
siteName: PropTypes.string,
scrollToTop: PropTypes.func.isRequired,
actions: PropTypes.shape({
loadRolesIfNeeded: PropTypes.func.isRequired
}).isRequired
loadRolesIfNeeded: PropTypes.func.isRequired,
}).isRequired,
}
static defaultProps = {
......
......@@ -10869,7 +10869,7 @@
"dev": true
},
"mattermost-redux": {
"version": "github:mattermost/mattermost-redux#15261d20e735bc09b0e8ef64a66b3fe4996715e5",
"version": "github:mattermost/mattermost-redux#65871294964d427e3c4e59860a0fd0c369317709",
"from": "github:mattermost/mattermost-redux#advanced-permissions-phase-2",
"requires": {
"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