From 3d082da03faca766f6d70f4e09f2e26146510d64 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Fri, 5 Sep 2025 22:30:04 -0700 Subject: [PATCH] fix: merge conflict issue --- eslint.config.js | 1 + src/lib/client/piefed/piefed.ts | 1 - src/routes/create/+layout.svelte | 2 +- src/routes/search/+page.svelte | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index 4fd4d3a8..1a06e844 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -29,6 +29,7 @@ export default ts.config( 'svelte/prefer-writable-derived': 'off', 'no-console': 'off', '@typescript-eslint/no-explicit-any': 'off', + 'svelte/no-navigation-without-resolve': 'off', }, }, { diff --git a/src/lib/client/piefed/piefed.ts b/src/lib/client/piefed/piefed.ts index db550ca0..05bd6ec1 100644 --- a/src/lib/client/piefed/piefed.ts +++ b/src/lib/client/piefed/piefed.ts @@ -31,7 +31,6 @@ import { toSortType, } from './rewrite' import type { paths } from './schema' -import type { SetPersonFlair, PersonView } from '../types' export class PiefedClient implements BaseClient { type: ClientType = { name: 'piefed', baseUrl: '/api/alpha' } diff --git a/src/routes/create/+layout.svelte b/src/routes/create/+layout.svelte index 2c1686a1..d57d5bba 100644 --- a/src/routes/create/+layout.svelte +++ b/src/routes/create/+layout.svelte @@ -1,5 +1,5 @@