From 00ab274d9e432e2974d8eb936f82ff3bebe35c9b Mon Sep 17 00:00:00 2001 From: madhawap Date: Tue, 14 Feb 2017 16:56:55 +0530 Subject: [PATCH] resolving conflicts when merging cloud and master brnaches --- modules/core/p2-profile-gen/pom.xml | 26 +------------------------- modules/integration/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml index 32a1edd0..a3520b5b 100644 --- a/modules/core/p2-profile-gen/pom.xml +++ b/modules/core/p2-profile-gen/pom.xml @@ -3187,10 +3187,6 @@ org.wso2.carbon.appmgt.mdm.wso2emm.feature.group ${appmgt.feature.version} - - org.wso2.carbon.appmgt.mdm.restconnector.feature.group - ${appmgt.feature.version} - org.wso2.carbon.appmgt.mobile.feature.group ${appmgt.feature.version} @@ -3215,25 +3211,6 @@ org.wso2.carbon.social.feature.group ${carbon.store.version} - -======= - - - org.wso2.carbon.appmgt.core.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.mdm.wso2emm.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.mobile.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.services.api.feature.group - ${appmgt.feature.version} - org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group ${carbon.device.mgt.plugin.version} @@ -3242,8 +3219,7 @@ org.wso2.carbon.appmgt.mdm.restconnector.feature.group ${carbon.device.mgt.plugin.version} - ->>>>>>> 6cd3950... Updated pom xmls accordding to rest connector + diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 72e02fa3..e01676b3 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -33,8 +33,8 @@ tests-artifacts tests-common - tests-integration - + + tests-iot-web-ui