diff options
Diffstat (limited to 'src/vs/platform/userDataSync/common/userDataSync.ts')
| -rw-r--r-- | src/vs/platform/userDataSync/common/userDataSync.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vs/platform/userDataSync/common/userDataSync.ts b/src/vs/platform/userDataSync/common/userDataSync.ts index c1d0e4508c3..f9c2aa24687 100644 --- a/src/vs/platform/userDataSync/common/userDataSync.ts +++ b/src/vs/platform/userDataSync/common/userDataSync.ts @@ -237,6 +237,7 @@ export function createSyncHeaders(executionId: string): IHeaders { export const enum UserDataSyncErrorCode { // Client Errors (>= 400 ) Unauthorized = 'Unauthorized', /* 401 */ + NotFound = 'NotFound', /* 404 */ Conflict = 'Conflict', /* 409 */ Gone = 'Gone', /* 410 */ PreconditionFailed = 'PreconditionFailed', /* 412 */ @@ -266,7 +267,6 @@ export const enum UserDataSyncErrorCode { LocalError = 'LocalError', IncompatibleLocalContent = 'IncompatibleLocalContent', IncompatibleRemoteContent = 'IncompatibleRemoteContent', - UnresolvedConflicts = 'UnresolvedConflicts', Unknown = 'Unknown', } @@ -476,7 +476,7 @@ export interface IUserDataSyncTask { stop(): Promise<void>; } -export interface IUserDataManualSyncTask extends IDisposable { +export interface IUserDataManualSyncTask { readonly id: string; merge(): Promise<void>; apply(): Promise<void>; |