From 00ab274d9e432e2974d8eb936f82ff3bebe35c9b Mon Sep 17 00:00:00 2001
From: madhawap <madhawa.818@gmail.com>
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 @@
 									<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>
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 @@
     <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>