mirror of
https://repository.entgra.net/community/product-iots.git
synced 2025-09-16 23:32:19 +00:00
Resolve merge conflicts
This commit is contained in:
commit
96046a19fa
2
pom.xml
2
pom.xml
@ -1082,7 +1082,7 @@
|
||||
|
||||
<!-- Carbon Device Management -->
|
||||
<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 -->
|
||||
<carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user