Resolve merge conflicts

8 years ago · 96046a19fa
parent aa7753872d 6780433831
commit 96046a19fa
1 changed files with 1 additions and 1 deletions
--- a/pom.xml
+++ b/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>