community
/
device-mgt-plugins
10
0
Fork 39
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
merge-requests/103/head
lasanthaDLPDS 5 years ago
parent a09638e79b 91c11520f8
commit e7d1df6cd2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
pom.xml
Unescape View File

@ -1232,14 +1232,14 @@
<javax.ws.rs.version>1.1.1</javax.ws.rs.version> <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.devicemgt.version>4.0.0-SNAPSHOT</carbon.devicemgt.version> <carbon.devicemgt.version>4.0.0</carbon.devicemgt.version>
<carbon.devicemgt.version.range>[4.0.0, 5.0.0)</carbon.devicemgt.version.range> <carbon.devicemgt.version.range>[4.0.0, 5.0.0)</carbon.devicemgt.version.range>
<!-- Carbon Device Management Plugins --> <!-- Carbon Device Management Plugins -->
<carbon.devicemgt.plugins.version>5.0.0-SNAPSHOT</carbon.devicemgt.plugins.version> <carbon.devicemgt.plugins.version>5.0.0-SNAPSHOT</carbon.devicemgt.plugins.version>
<!-- Android Agent Artifact Version--> <!-- Android Agent Artifact Version-->
<android.agent.version>3.7.2</android.agent.version> <android.agent.version>4.0.0</android.agent.version>
<!-- Carbon Commons --> <!-- Carbon Commons -->
<carbon.commons.version>4.6.21</carbon.commons.version> <carbon.commons.version>4.6.21</carbon.commons.version>

Write Preview
Loading…
Cancel
Save