diff options
Diffstat (limited to 'src/client/sync/index.ts')
| -rw-r--r-- | src/client/sync/index.ts | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/client/sync/index.ts b/src/client/sync/index.ts index 80d0cc1..2472871 100644 --- a/src/client/sync/index.ts +++ b/src/client/sync/index.ts @@ -30,3 +30,12 @@ export { type ServerReviewLog, type SyncPullResult, } from "./pull"; + +export { + ConflictResolver, + conflictResolver, + createConflictResolver, + type ConflictResolutionItem, + type ConflictResolutionResult, + type ConflictResolverOptions, +} from "./conflict"; |