resolved conflicts

Amrita Vishnoi
2 parents 531f8772 7a102231
Showing 2 changed files with 2 additions and 3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
@@ -208,9 +208,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                             }
                             if (isMailForPassword)
                                 message = "Please check you email and reset your password.";
-                            else {
+                            else
                                 message = "Please check you email, sent UserId in your email.";
-                            }
                                 alert(message);
  
  
@@ -283,7 +283,7 @@ AIA.constant(&#39;ImageTypes&#39;, [&#39;Illustration&#39;, &#39;Cadaver Photograph&#39;, &#39;Radiograph&#39;])
 AIA.constant("LoginConstants", {
     "USER_NOT_FOUND": "UserId or Password is incorrect.",
     "ERROR_IN_FECTHING_DETAILS": "Error in fecthing details.",
-    "MAIL_NOT_SENT" : "We are facing some issue in sending email. Please try after sometime.",
+    "MAIL_NOT_SENT": "We are facing some issue in sending email. Please try after sometime."
  
 })