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.

Harshan Liyanage 79abb6ef86 Fixed merge conflicts.		7 years ago
..
org.wso2.carbon.device.mgt.analytics.dashboard	…
org.wso2.carbon.device.mgt.analytics.data.publisher	…
org.wso2.carbon.device.mgt.api	Fixed merge conflicts.	7 years ago
org.wso2.carbon.device.mgt.common	…
org.wso2.carbon.device.mgt.core	Fixed merge conflicts.	7 years ago
org.wso2.carbon.device.mgt.extensions	…
org.wso2.carbon.device.mgt.ui	Fixed merge conflicts.	7 years ago
org.wso2.carbon.device.mgt.url.printer	…
pom.xml	…