diff options
| author | transtrike <transtrike@gmail.com> | 2020-12-15 22:10:28 +0200 |
|---|---|---|
| committer | transtrike <transtrike@gmail.com> | 2020-12-15 22:10:28 +0200 |
| commit | 39ed95b317e53ceab72b7afd0867d87233fe681e (patch) | |
| tree | 730716b286e4918275397b9181bf4cf319121be7 /src/DevHive.Web/Controllers/RoleController.cs | |
| parent | 6f4d5ea241b07b8701df08a678baff417ae56ccf (diff) | |
| download | DevHive-39ed95b317e53ceab72b7afd0867d87233fe681e.tar DevHive-39ed95b317e53ceab72b7afd0867d87233fe681e.tar.gz DevHive-39ed95b317e53ceab72b7afd0867d87233fe681e.zip | |
Resolving RoleController conflicts
Diffstat (limited to 'src/DevHive.Web/Controllers/RoleController.cs')
| -rw-r--r-- | src/DevHive.Web/Controllers/RoleController.cs | 6 |
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] |