Fixing conflict

merge-requests/1/head
Ruwan Yatawara 7 years ago
commit 7182655e27

@ -1532,10 +1532,10 @@
<product.iot.version>${project.version}</product.iot.version>
<!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>4.0.137-SNAPSHOT</carbon.device.mgt.plugin.version>
<carbon.device.mgt.plugin.version>4.1.0</carbon.device.mgt.plugin.version>
<!-- API Management -->
<carbon.api.mgt.version>6.2.157</carbon.api.mgt.version>
<carbon.api.mgt.version>6.2.170</carbon.api.mgt.version>
<carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
<!-- Carbon Mediation -->

Loading…
Cancel
Save