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.

harshanL 1d94f81ec6 Merge branch 'master' of https://github.com/geethkokila/product-cdm ... Conflicts: components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/Device.java		10 years ago
..
src	Merge branch 'master' of https://github.com/geethkokila/product-cdm	10 years ago
pom.xml	fixing merge conflicts	10 years ago