Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 11:38:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #96370

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-06-01 16:13:24 +02:00
parent 618e9e98c5
commit 2db11562e3
15 changed files with 134 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/services/userDataSync/electron-browser/userDataSyncService.ts
View File

@@ -89,8 +89,8 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
return this.channel.call('resetLocal');
}
isFirstTimeSyncWithMerge(): Promise<boolean> {
return this.channel.call('isFirstTimeSyncWithMerge');
isFirstTimeSyncingWithAnotherMachine(): Promise<boolean> {
return this.channel.call('isFirstTimeSyncingWithAnotherMachine');
}
acceptConflict(conflict: URI, content: string): Promise<void> {