DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

conflict resolution

Browse source
This commit is contained in:
akemidx 2024-04-22 20:09:40 -04:00
parent 01c24ab4cd
commit 0d049a0be7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Users/UsersController.php
View file

@ -565,7 +565,7 @@ class UsersController extends Controller
trans('general.licenses'), trans('general.licenses'),
trans('general.accessories'), trans('general.accessories'),
trans('general.consumables'), trans('general.consumables'),
trans('general.groups'), trans('admin/users/table.groups'),
trans('general.permission_level'), trans('general.permission_level'),
trans('general.notes'), trans('general.notes'),
trans('admin/users/table.activated'), trans('admin/users/table.activated'),