Fixed merge conflicts.

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">