From 6056a433d560561e3d1e6cda4cf7b4063e49bbb9 Mon Sep 17 00:00:00 2001
From: Menaka Jayawardena <menaka@wso2.com>
Date: Fri, 6 Oct 2017 13:03:33 +0530
Subject: [PATCH] Resolved Conflicts

---
 .../publisher/src/components/Application/ApplicationListing.jsx | 1 +
 .../src/main/resources/publisher/src/index.js                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx
index 1a79b254a1..6ce6d1ad78 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx
@@ -33,6 +33,7 @@ import AuthHandler from "../../api/authHandler";
  * When the wizard is completed, data will be arranged and sent to the api.
  * */
 class ApplicationListing extends Component {
+
     constructor() {
         super();
         this.searchApplications = this.searchApplications.bind(this);
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/index.js
index 95b8c1eb60..0522002a98 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/index.js
@@ -21,7 +21,7 @@ import Publisher from './App';
 import ReactDOM from 'react-dom';
 import 'bootstrap/dist/css/bootstrap.css';
 import registerServiceWorker from './registerServiceWorker';
-import {IntlProvider, addLocaleData, defineMessages} from 'react-intl';
+import {addLocaleData, defineMessages, IntlProvider} from 'react-intl';
 import Axios from 'axios';
 import Constants from './common/constants';
 import Configuration from './common/configuration';