From fac10f81e5a5f951e5eed52c006c0e00583f1ff8 Mon Sep 17 00:00:00 2001
From: warunalakshitha <warudanu@gmail.com>
Date: Sun, 15 Oct 2017 15:28:24 +0530
Subject: [PATCH] fix conflicts

---
 modules/p2-profile/iot-core-profile/pom.xml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index 19049281..251faaf4 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -755,19 +755,17 @@
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <!-- End of Geo Dashboard feature -->
-<<<<<<< HEAD
+
                                 <!-- Realtime Operations Feature -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.remote.session.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <!-- End of Realtime Operations Feature -->
-=======
 
                                 <!--MQTT Dashboard-->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.andes.extensions.device.mgt.api.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
->>>>>>> 88f24ec119dafa2172de4b32632aa5efb7973081
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -2541,20 +2539,18 @@
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Geo Dashboard Feature -->
-<<<<<<< HEAD
                                 <!-- Realtime Operations Feature -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Realtime Operations Feature -->
-=======
+
                             <!--MQTT Dashboard Feature-->
                             <feature>
                                 <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
                                 <version>${carbon.device.mgt.plugin.version}</version>
                             </feature>
->>>>>>> 88f24ec119dafa2172de4b32632aa5efb7973081
                             </features>
                         </configuration>
                     </execution>
@@ -3189,20 +3185,17 @@
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Geo Dashboard Feature -->
-<<<<<<< HEAD
                                 <!-- Realtime Operations Feature -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Realtime Operations Feature -->
-=======
                             <!--MQTT Dashboard Feature-->
                             <feature>
                                 <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
                                 <version>${carbon.device.mgt.plugin.version}</version>
                             </feature>
->>>>>>> 88f24ec119dafa2172de4b32632aa5efb7973081
                             </features>
                         </configuration>
                     </execution>