Skip to content

Commit

Permalink
Eliminate merge issues
Browse files Browse the repository at this point in the history
  • Loading branch information
akak1977 committed Jun 3, 2020
1 parent 36fecb0 commit 89914be
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public async Task<ActionResult<UserActionIdentityResult>> RegisterOrganization([
Description = $"Email '{orgRegistration.Email}' is already taken."
};

return IdentityResult.Failed(error);
return UserActionIdentityResult.Failed(error);
}

user = await _userManager.FindByNameAsync(orgRegistration.UserName);
Expand All @@ -129,7 +129,7 @@ public async Task<ActionResult<UserActionIdentityResult>> RegisterOrganization([
Description = $"User name '{orgRegistration.UserName}' is already taken."
};

return IdentityResult.Failed(error);
return UserActionIdentityResult.Failed(error);
}

var organization = orgRegistration.ToOrganization();
Expand Down

0 comments on commit 89914be

Please sign in to comment.