From 904935e327e2901220c24fe1c9e7d242e2789bb8 Mon Sep 17 00:00:00 2001 From: Anant Prakash Date: Thu, 31 May 2018 16:29:58 +0530 Subject: [PATCH] Correct ungraceful merge --- .../dendrite/clientapi/auth/storage/accounts/accounts_table.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/accounts_table.go b/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/accounts_table.go index 645dfdbc9..3b4e6bd50 100644 --- a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/accounts_table.go +++ b/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/accounts_table.go @@ -116,7 +116,7 @@ func (s *accountsStatements) selectAccountByLocalpart( stmt := s.selectAccountByLocalpartStmt err = stmt.QueryRowContext(ctx, localpart).Scan(&acc.Localpart, &acc.AppServiceID) if err == nil { - acc.UserID = makeUserID(localpart, s.serverName) + acc.UserID = userutil.MakeUserID(localpart, s.serverName) acc.ServerName = s.serverName } return