Resolving conflicts

7 years ago · 8dbaba1feb
parent 74e071706e 034fe9313e
commit 8dbaba1feb
1 changed files with 1 additions and 2 deletions
--- a/features/application-mgt/pom.xml
+++ b/features/application-mgt/pom.xml
@ -35,12 +35,11 @@

    <modules>
        <module>org.wso2.carbon.device.application.mgt.api.feature</module>
-        <module>org.wso2.carbon.device.application.mgt.publisher.ui.feature</module>
        <module>org.wso2.carbon.device.application.mgt.auth.handler.feature</module>
        <!--<module>org.wso2.carbon.device.application.mgt.ui.feature</module>-->
        <module>org.wso2.carbon.device.application.mgt.feature</module>
        <!--<module>org.wso2.carbon.device.application.mgt.extensions.feature</module>-->
        <module>org.wso2.carbon.device.application.mgt.server.feature</module>
-
+        <module>org.wso2.carbon.device.application.mgt.publisher.ui.feature</module>
    </modules>
 </project>