mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Merge branch 'master' of git://github.com/wso2/carbon-device-mgt
# Resolving Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
This commit is contained in:
parent
7f9cf0ffea
commit
7cdea248f7
@ -55,6 +55,7 @@ public final class DeviceManagementConfig {
|
||||
private OperationAnalyticsConfiguration operationAnalyticsConfiguration;
|
||||
private String defaultGroupsConfiguration;
|
||||
private RemoteSessionConfiguration remoteSessionConfiguration;
|
||||
private ArchivalConfiguration archivalConfiguration;
|
||||
|
||||
|
||||
@XmlElement(name = "ManagementRepository", required = true)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user