You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
This file contains invisible Unicode characters that may be processed differently from what appears below. If your use case is intentional and legitimate, you can safely ignore this warning. Use the Escape button to reveal hidden characters.
[1mdiff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml [m
[1mindex addf38e..4e2ad6b 100644 [m
[1m--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml [m
[1m+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml [m
[36m@@ -43,8 +43,8 @@ [m
<MaxRetries>5</MaxRetries> [m
<MinRetriesToMarkUnreachable>8</MinRetriesToMarkUnreachable> [m
<MinRetriesToMarkInactive>20</MinRetriesToMarkInactive> [m
[31m- <!--<PolicyEvaluationPointName>SimplePolicyEvaluationServiceComponent</PolicyEvaluationPointName>--> [m
[31m- <PolicyEvaluationPointName>MergedPolicyEvaluationServiceComponent</PolicyEvaluationPointName> [m
[32m+ [m [32m <!--<PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>--> [m
[32m+ [m [32m <PolicyEvaluationPoint>Merged</PolicyEvaluationPoint> [m
<Platforms> [m
<Platform>android</Platform> [m
<Platform>ios</Platform> [m