community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merging conflicts

Browse Source
This commit is contained in:
lasantha 2017-11-15 17:15:58 +05:30
parent 0185519a1f
commit bbae97a92b
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -1869,11 +1869,7 @@
<axiom.wso2.version>1.2.11.wso2v10</axiom.wso2.version>
<!-- Carbon Device Management -->
<<<<<<< HEAD
<carbon.device.mgt.version>3.0.170</carbon.device.mgt.version>
=======
<carbon.device.mgt.version>3.0.173-SNAPSHOT</carbon.device.mgt.version>
>>>>>>> 1b8ecafce5df8cf9f234e6877c6ec2142ffe23d0
<!-- Carbon Commons -->
<carbon.commons.version>4.4.8</carbon.commons.version>