You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Menaka Jayawardena 6056a433d5 Resolved Conflicts		7 years ago
..
org.wso2.carbon.device.application.mgt.api	…
org.wso2.carbon.device.application.mgt.authhandler	…
org.wso2.carbon.device.application.mgt.common	…
org.wso2.carbon.device.application.mgt.core	…
org.wso2.carbon.device.application.mgt.publisher.ui	Resolved Conflicts	7 years ago
org.wso2.carbon.device.application.mgt.store.ui	…
org.wso2.carbon.device.application.mgt.ui	Added the datasourceService	7 years ago
pom.xml	…