From 7cdea248f795fc4d30a01b4c13263c6e9b050d1e Mon Sep 17 00:00:00 2001 From: dunithd Date: Wed, 22 Nov 2017 11:14:55 +0530 Subject: [PATCH] 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 --- .../carbon/device/mgt/core/config/DeviceManagementConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java index c779332c77..175ad8488f 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java @@ -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)