community
/
device-mgt-core
12
0
Fork 45
Code Issues Pull Requests 24 Packages Projects Releases Wiki Activity

Resolving conflicts

Browse Source
merge-requests/7/head
megala21 7 years ago
parent 74e071706e 034fe9313e
commit 8dbaba1feb
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File

3
features/application-mgt/pom.xml
Unescape View File

@ -35,12 +35,11 @@
<modules> <modules>
<module>org.wso2.carbon.device.application.mgt.api.feature</module> <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.auth.handler.feature</module>
<!--<module>org.wso2.carbon.device.application.mgt.ui.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.feature</module>
<!--<module>org.wso2.carbon.device.application.mgt.extensions.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.server.feature</module>
<module>org.wso2.carbon.device.application.mgt.publisher.ui.feature</module>
</modules> </modules>
</project> </project>
Write Preview
Loading…
Cancel
Save