From c02647a0fa025d9807b242a4707a2525e578000c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 25 Sep 2024 20:32:03 +0100
Subject: [PATCH] Moved merge into delete gate, since they do technically
 delete

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/partials/users-bulk-actions.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/users-bulk-actions.blade.php b/resources/views/partials/users-bulk-actions.blade.php
index ef800d18a0..5f9b09ccca 100644
--- a/resources/views/partials/users-bulk-actions.blade.php
+++ b/resources/views/partials/users-bulk-actions.blade.php
@@ -13,11 +13,11 @@
 
                     @can('update', \App\Models\User::class)
                         <option value="edit">{{ trans('general.bulk_edit') }}</option>
-                        <option value="merge">{!! trans('general.merge_users') !!}</option>
                     @endcan
 
                     @can('delete', \App\Models\User::class)
                         <option value="delete">{!! trans('general.bulk_checkin_delete') !!}</option>
+                        <option value="merge">{!! trans('general.merge_users') !!}</option>
                     @endcan
 
                     <option value="bulkpasswordreset">{{ trans('button.send_password_link') }}</option>