natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

weird merge error

This commit is contained in:
cutestnekoaqua 2023-02-10 20:52:58 +01:00
parent 72e5b4f487
commit 5bf632d3eb
No known key found for this signature in database
GPG Key ID: 6BF0964A5069C1E0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts
View File

@ -5,7 +5,7 @@ import { apiAccountMastodon } from './endpoints/account.js';
import { apiStatusMastodon } from './endpoints/status.js'; import { apiStatusMastodon } from './endpoints/status.js';
import { apiFilterMastodon } from './endpoints/filter.js'; import { apiFilterMastodon } from './endpoints/filter.js';
import { apiTimelineMastodon } from './endpoints/timeline.js'; import { apiTimelineMastodon } from './endpoints/timeline.js';
import { apiNotificationMastodon } from './endpoints/notifications.js'; import { apiNotificationsMastodon } from './endpoints/notifications.js';
import { apiSearchMastodon } from './endpoints/search.js'; import { apiSearchMastodon } from './endpoints/search.js';
import { getInstance } from './endpoints/meta.js'; import { getInstance } from './endpoints/meta.js';