From 66d237cf6154fb826924c91387795ad71cac81e0 Mon Sep 17 00:00:00 2001
From: Harshan Liyanage <harshan@wso2.com>
Date: Fri, 1 Sep 2017 20:44:08 +0530
Subject: [PATCH] Fixed merge conflicts.

---
 .../devicemgt/app/pages/cdmf.page.user.create/create.hbs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs
index 9985d84c47..6dc712ad2c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs
@@ -128,7 +128,7 @@
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
                     <h4>
-                        User added successfully.
+                        An invitation mail will be sent to this user to initiate device enrollment.
                     </h4>
                 </div>
                 <div id="modal-content-user-created-with-message" class="hide">