aboutsummaryrefslogtreecommitdiff
path: root/src/DevHive.Web/Controllers/RoleController.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/DevHive.Web/Controllers/RoleController.cs')
-rw-r--r--src/DevHive.Web/Controllers/RoleController.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/DevHive.Web/Controllers/RoleController.cs b/src/DevHive.Web/Controllers/RoleController.cs
index 15db95d..e27c330 100644
--- a/src/DevHive.Web/Controllers/RoleController.cs
+++ b/src/DevHive.Web/Controllers/RoleController.cs
@@ -18,7 +18,12 @@ 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
}
[HttpPost]