Fixed merge conflicts.

This commit is contained in:
Harshan Liyanage 2017-09-01 20:44:08 +05:30
parent 79abb6ef86
commit 66d237cf61

View File

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