From bd8bbcb503c9d44f8d9addd025608296e72bfdcc Mon Sep 17 00:00:00 2001
From: Ben Schumacher <ben.schumacher@mattermost.com>
Date: Tue, 23 Sep 2025 11:34:04 +0200
Subject: [PATCH] Fix bad merge (#33949)

---
 server/channels/store/storetest/user_store.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/channels/store/storetest/user_store.go b/server/channels/store/storetest/user_store.go
index efca4155fbd..59cd4275988 100644
--- a/server/channels/store/storetest/user_store.go
+++ b/server/channels/store/storetest/user_store.go
@@ -14,7 +14,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/crypto/bcrypt"
 
 	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/public/shared/request"