Resolve merge conflicts

application-manager-new
Rasika Perera 8 years ago
commit 96046a19fa

@ -1082,7 +1082,7 @@
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.device.mgt.version>1.2.1-SNAPSHOT</carbon.device.mgt.version> <carbon.device.mgt.version>1.2.1-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[1.2.1, 2.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[1.1.3, 2.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
<carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version> <carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version>

Loading…
Cancel
Save