From dbeeb7cf4a715580432232c7098e4d86afccb37c Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Mon, 3 Aug 2020 12:01:24 -0600
Subject: fix merge conflicts

---
 Jellyfin.Api/Controllers/UserController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Jellyfin.Api/Controllers/UserController.cs')

diff --git a/Jellyfin.Api/Controllers/UserController.cs b/Jellyfin.Api/Controllers/UserController.cs
index 8038ca044..ce0c9281b 100644
--- a/Jellyfin.Api/Controllers/UserController.cs
+++ b/Jellyfin.Api/Controllers/UserController.cs
@@ -455,7 +455,7 @@ namespace Jellyfin.Api.Controllers
         [ProducesResponseType(StatusCodes.Status200OK)]
         public async Task<ActionResult<UserDto>> CreateUserByName([FromBody] CreateUserByName request)
         {
-            var newUser = _userManager.CreateUser(request.Name);
+            var newUser = await _userManager.CreateUserAsync(request.Name).ConfigureAwait(false);
 
             // no need to authenticate password for new user
             if (request.Password != null)
-- 
cgit v1.2.3