From 39ed95b317e53ceab72b7afd0867d87233fe681e Mon Sep 17 00:00:00 2001 From: transtrike Date: Tue, 15 Dec 2020 22:10:28 +0200 Subject: Resolving RoleController conflicts --- src/DevHive.Web/Controllers/RoleController.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/DevHive.Web/Controllers/RoleController.cs') 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] -- cgit v1.2.3