fix: merge conflict issue

This commit is contained in:
James Xylight committed 2025-09-05 22:32:29 -07:00
1 parent aa270be722
commit 3d082da03f
4 files changed
+4 -4

No files matched your search

+1
View File
@@ -29,6 +29,7 @@ export default ts.config(
'svelte/prefer-writable-derived': 'off', 'svelte/prefer-writable-derived': 'off',
'no-console': 'off', 'no-console': 'off',
'@typescript-eslint/no-explicit-any': 'off', '@typescript-eslint/no-explicit-any': 'off',
'svelte/no-navigation-without-resolve': 'off',
}, },
}, },
{ {
-1
View File
@@ -31,7 +31,6 @@ import {
toSortType, toSortType,
} from './rewrite' } from './rewrite'
import type { paths } from './schema' import type { paths } from './schema'
import type { SetPersonFlair, PersonView } from '../types'
export class PiefedClient implements BaseClient { export class PiefedClient implements BaseClient {
type: ClientType = { name: 'piefed', baseUrl: '/api/alpha' } type: ClientType = { name: 'piefed', baseUrl: '/api/alpha' }
+1 -1
View File
@@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { site } from '$lib/lemmy.svelte' import { site } from '$lib/client/lemmy.svelte'
import Header from '$lib/components/ui/layout/pages/Header.svelte' import Header from '$lib/components/ui/layout/pages/Header.svelte'
import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte' import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte'
import { t } from '$lib/i18n/translations' import { t } from '$lib/i18n/translations'
+2 -2
View File
@@ -1,6 +1,7 @@
<script lang="ts"> <script lang="ts">
import { navigating, page } from '$app/state' import { navigating, page } from '$app/state'
import { profile } from '$lib/auth.svelte.js' import { profile } from '$lib/auth.svelte.js'
import { client } from '$lib/client/lemmy.svelte'
import ObjectAutocomplete from '$lib/components/lemmy/ObjectAutocomplete.svelte' import ObjectAutocomplete from '$lib/components/lemmy/ObjectAutocomplete.svelte'
import CommentItem from '$lib/components/lemmy/comment/CommentItem.svelte' import CommentItem from '$lib/components/lemmy/comment/CommentItem.svelte'
import CommunityItem from '$lib/components/lemmy/community/CommunityItem.svelte' import CommunityItem from '$lib/components/lemmy/community/CommunityItem.svelte'
@@ -21,7 +22,7 @@
isUser, isUser,
} from '$lib/lemmy/item.js' } from '$lib/lemmy/item.js'
import { searchParam } from '$lib/util.svelte.js' import { searchParam } from '$lib/util.svelte.js'
import { Button, Select, Spinner, TextLoader } from 'mono-svelte' import { Button, Select, TextLoader } from 'mono-svelte'
import Option from 'mono-svelte/forms/select/Option.svelte' import Option from 'mono-svelte/forms/select/Option.svelte'
import { import {
AdjustmentsHorizontal, AdjustmentsHorizontal,
@@ -33,7 +34,6 @@
import { expoOut } from 'svelte/easing' import { expoOut } from 'svelte/easing'
import { fly, slide } from 'svelte/transition' import { fly, slide } from 'svelte/transition'
import SearchBar from './SearchBar.svelte' import SearchBar from './SearchBar.svelte'
import { client } from '$lib/client/lemmy.svelte'
let { data } = $props() let { data } = $props()