Resolving merge conflicts

10 years ago · fc80514d74
parent d71ea209c2 0a824d9644
commit fc80514d74
2 changed files with 2 additions and 1 deletions
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java
@ -44,6 +44,7 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementService;
 import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;

 import java.io.IOException;
+import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/notification-messages.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/notification-messages.xml
@ -21,7 +21,7 @@
 <Notifications>
    <EnrolmentNotifications>
            <Header>Dear {title} {user-name},</Header>
-            <Body>Please go to the following url and enrol your device</Body>
+            <Body>You have been registered to the WSO2 MDM. Below is the link to enroll.</Body>
            <Url>{downloadUrl}</Url>
            <Footer>
 Best Regards,