Fixing merge

webapp/components/admin_console/compliance_reports.jsx

@@ -9,7 +9,9 @@ import UserStore from '../../stores/user_store.jsx';
 import * as Client from '../../utils/client.jsx';
 import * as AsyncClient from '../../utils/async_client.jsx';
 
-import {FormattedMessage, FormattedDate, FormattedTime} from 'mm-intl';
+import {FormattedMessage, FormattedDate, FormattedTime} from 'react-intl';
+
+import React from 'react';
 
 export default class ComplianceReports extends React.Component {
     constructor(props) {

webapp/components/admin_console/compliance_settings.jsx

@@ -4,7 +4,10 @@
 import * as Client from '../../utils/client.jsx';
 import * as AsyncClient from '../../utils/async_client.jsx';
 
-import {injectIntl, intlShape, defineMessages, FormattedMessage, FormattedHTMLMessage} from 'mm-intl';
+import {injectIntl, intlShape, defineMessages, FormattedMessage, FormattedHTMLMessage} from 'react-intl';
+
+import React from 'react';
+import ReactDOM from 'react-dom';
 
 var holders = defineMessages({
     saving: {