acetheking987/bsky-social-app
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

clean merge conflict

Browse Source
This commit is contained in:
Matthieu Sieben
2024-07-14 09:35:26 +02:00
parent e3e1a5c7a9
commit 3476d2853c
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/state/session/agent.ts
-9
View File
@@ -1,14 +1,5 @@
<<<<<<< HEAD
import {AtpSessionData, AtpSessionEvent, BskyAgent} from '@atproto/api' import {AtpSessionData, AtpSessionEvent, BskyAgent} from '@atproto/api'
import {TID} from '@atproto/common-web' import {TID} from '@atproto/common-web'
=======
import {
AtpSessionData,
AtpSessionEvent,
BskyAgent,
SessionDispatcher,
} from '@atproto/api'
>>>>>>> 1a535b0b7 (use xrpc dispatcher)
import {networkRetry} from '#/lib/async/retry' import {networkRetry} from '#/lib/async/retry'
import { import {