From 74edd973220182d6c9748bef3fed8fb31031ee4c Mon Sep 17 00:00:00 2001
From: madhawap <madhawa.818@gmail.com>
Date: Tue, 14 Feb 2017 12:56:41 +0530
Subject: [PATCH] minor fix

---
 modules/core/p2-profile-gen/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml
index 90465ccf..32a1edd0 100644
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@@ -3178,7 +3178,6 @@
                                 </feature>
                                 <!-- End of IoTServer Features -->
 
-<<<<<<< HEAD
 								<!-- App management features-->
 								<feature>
 									<id>org.wso2.carbon.appmgt.core.feature.group</id>