Merge pull request #290 from madhawap/3.1.0-test

minor fix
8 years ago · d35fe57dd5
parent 905a7d8c50 74edd97322
commit d35fe57dd5
1 changed files with 0 additions and 1 deletions
--- 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>