From 902e523a712b4a8f6dfcc2114c73ca85dff1e9a9 Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Thu, 17 Dec 2020 23:06:34 +0200
Subject: Fixing merge conflict

---
 src/DevHive.Services/Services/UserService.cs | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src')

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)
-- 
cgit v1.2.3