Resolving RoleController conflicts

1 files changed, 1 insertions, 5 deletions

diff --git a/src/DevHive.Web/Controllers/RoleController.cs b/src/DevHive.Web/Controllers/RoleController.cs
index e27c330..1e11ee1 100644
--- a/src/DevHive.Web/Controllers/RoleController.cs
+++ b/src/DevHive.Web/Controllers/RoleController.cs
@@ -18,12 +18,8 @@ namespace DevHive.Web.Controllers
 
 		public RoleController(DevHiveContext context, IMapper mapper)
 		{
-<<<<<<< HEAD
-			this._service = new RoleService(context, mapper);
-			this._roleMapper = mapper;
-=======
 			this._roleService = new RoleService(context, mapper);
->>>>>>> 791c559712a161c745a407a87d0f7e8d1f00492c
+			this._roleMapper = mapper;
 		}
 
 		[HttpPost]