mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Resolved Conflicts
This commit is contained in:
parent
87aaeca85f
commit
6056a433d5
@ -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);
|
||||
|
||||
@ -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';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user