Resolved Conflicts

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);

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';