diff options
| author | transtrike <transtrike@gmail.com> | 2020-12-17 23:06:34 +0200 |
|---|---|---|
| committer | transtrike <transtrike@gmail.com> | 2020-12-17 23:06:34 +0200 |
| commit | 902e523a712b4a8f6dfcc2114c73ca85dff1e9a9 (patch) | |
| tree | 95271deca9b424cd8c35129ea33199d4c61c7020 /src/DevHive.Services/Services/UserService.cs | |
| parent | 9af49263c0a182acb9c0ba4aa7982bbe51855465 (diff) | |
| download | DevHive-902e523a712b4a8f6dfcc2114c73ca85dff1e9a9.tar DevHive-902e523a712b4a8f6dfcc2114c73ca85dff1e9a9.tar.gz DevHive-902e523a712b4a8f6dfcc2114c73ca85dff1e9a9.zip | |
Fixing merge conflict
Diffstat (limited to 'src/DevHive.Services/Services/UserService.cs')
| -rw-r--r-- | src/DevHive.Services/Services/UserService.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/DevHive.Services/Services/UserService.cs b/src/DevHive.Services/Services/UserService.cs index bd9c7c5..af8a6f0 100644 --- a/src/DevHive.Services/Services/UserService.cs +++ b/src/DevHive.Services/Services/UserService.cs @@ -72,13 +72,7 @@ namespace DevHive.Services.Services User user = await this._userRepository.GetByIdAsync(id) ?? throw new ArgumentException("User does not exist!"); -<<<<<<< HEAD return this._userMapper.Map<UserServiceModel>(user); -======= - UserServiceModel model = this._userMapper.Map<UserServiceModel>(user); - - return model; ->>>>>>> d104a6810dcca58e7003833e5b7c74a7722df879 } public async Task<UserServiceModel> UpdateUser(UpdateUserServiceModel updateModel) |