mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Resolving conflicts
This commit is contained in:
commit
8dbaba1feb
@ -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>
|
||||||
Loading…
Reference in New Issue
Block a user