From 5982bd490b074752a1d979f028783e88f1554be7 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Wed, 16 Mar 2016 18:35:53 -0700
Subject: [PATCH] Fixing merge

---
 .../components/admin_console/compliance_reports.jsx          | 4 +++-
 .../components/admin_console/compliance_settings.jsx         | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
 rename {web/react => webapp}/components/admin_console/compliance_reports.jsx (99%)
 rename {web/react => webapp}/components/admin_console/compliance_settings.jsx (99%)

diff --git a/web/react/components/admin_console/compliance_reports.jsx b/webapp/components/admin_console/compliance_reports.jsx
similarity index 99%
rename from web/react/components/admin_console/compliance_reports.jsx
rename to webapp/components/admin_console/compliance_reports.jsx
index 2a94b6f1d3..3dd073ccde 100644
--- a/web/react/components/admin_console/compliance_reports.jsx
+++ b/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) {
diff --git a/web/react/components/admin_console/compliance_settings.jsx b/webapp/components/admin_console/compliance_settings.jsx
similarity index 99%
rename from web/react/components/admin_console/compliance_settings.jsx
rename to webapp/components/admin_console/compliance_settings.jsx
index 8e6ca63404..2299844753 100644
--- a/web/react/components/admin_console/compliance_settings.jsx
+++ b/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: {