Fixing conflict

This commit is contained in:
Ruwan Yatawara 2018-03-12 19:12:42 +05:30
commit 7182655e27

View File

@ -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 -->