3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-05-03 21:25:19 +00:00

conflict resolution

This commit is contained in:
akemidx
2024-04-22 20:09:40 -04:00
parent 01c24ab4cd
commit 0d049a0be7

View File

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