From bfcfa969a0cf4b276c39e96efde5dffb5da5536b Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Fri, 7 Nov 2025 01:43:33 -0500
Subject: [PATCH] rearrange imports in RemoteUserResolveService to avoid merge
 conflicts

---
 packages/backend/src/core/RemoteUserResolveService.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/core/RemoteUserResolveService.ts b/packages/backend/src/core/RemoteUserResolveService.ts
index 6a0d28dcdf..3d21cb92a9 100644
--- a/packages/backend/src/core/RemoteUserResolveService.ts
+++ b/packages/backend/src/core/RemoteUserResolveService.ts
@@ -11,19 +11,19 @@ import type { UsersRepository } from '@/models/_.js';
 import type { MiLocalUser, MiRemoteUser } from '@/models/User.js';
 import type { Config } from '@/config.js';
 import type Logger from '@/logger.js';
-import { isRemoteUser } from '@/models/User.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { ILink, WebfingerService } from '@/core/WebfingerService.js';
 import { RemoteLoggerService } from '@/core/RemoteLoggerService.js';
 import { ApDbResolverService } from '@/core/activitypub/ApDbResolverService.js';
 import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
-import { bindThis } from '@/decorators.js';
-import { renderInlineError } from '@/misc/render-inline-error.js';
-import { CacheService } from '@/core/CacheService.js';
 import { TimeService } from '@/global/TimeService.js';
-import * as Acct from '@/misc/acct.js';
+import { CacheService } from '@/core/CacheService.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { InternalEventService } from '@/global/InternalEventService.js';
+import * as Acct from '@/misc/acct.js';
+import { isRemoteUser } from '@/models/User.js';
+import { bindThis } from '@/decorators.js';
+import { renderInlineError } from '@/misc/render-inline-error.js';
 
 @Injectable()
 export class RemoteUserResolveService {