community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolving conflicts when merging cloud and master brnaches

Browse Source
This commit is contained in:
madhawap 2017-02-14 16:56:55 +05:30
parent 74edd97322
commit 00ab274d9e
2 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/core/p2-profile-gen/pom.xml
View File

@ -3187,10 +3187,6 @@
<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.appmgt.mobile.feature.group</id>
<version>${appmgt.feature.version}</version>
@ -3215,25 +3211,6 @@
<id>org.wso2.carbon.social.feature.group</id>
<version>${carbon.store.version}</version>
</feature>
<!-- End of app management features-->
=======
<!-- App management features-->
<feature>
<id>org.wso2.carbon.appmgt.core.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.appmgt.mobile.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.appmgt.services.api.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
@ -3242,8 +3219,7 @@
<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- End of app management features-->
>>>>>>> 6cd3950... Updated pom xmls accordding to rest connector
<!-- End of app management features-->
<!-- Device Management Features -->
<feature>

4
modules/integration/pom.xml
View File

@ -33,8 +33,8 @@
<modules>
<module>tests-artifacts</module>
<module>tests-common</module>
<module>tests-integration</module>
<!--module>tests-iot-web-ui</module-->
<!--<module>tests-integration</module>-->
<module>tests-iot-web-ui</module>
</modules>
</project>