clean merge conflict

2024-07-14 09:35:26 +02:00
parent e3e1a5c7a9
commit 3476d2853c
1 changed files with 0 additions and 9 deletions
@@ -1,14 +1,5 @@
-<<<<<<< HEAD
 import {AtpSessionData, AtpSessionEvent, BskyAgent} from '@atproto/api'
 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 {