2 files changed
+3
-5
lines changedOriginal file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
226 | 226 |
| |
227 | 227 |
| |
228 | 228 |
| |
229 |
| - | |
| 229 | + | |
230 | 230 |
| |
231 | 231 |
| |
232 | 232 |
| |
| |||
265 | 265 |
| |
266 | 266 |
| |
267 | 267 |
| |
268 |
| - | |
269 |
| - | |
270 |
| - | |
| 268 | + | |
271 | 269 |
| |
272 | 270 |
| |
273 | 271 |
| |
|
- build/gulpfile.vscode.js+1-1
- build/win32/code.iss+1-1
- extensions/npm/package.json+1-1
- extensions/npm/src/features/packageJSONContribution.ts+20-1
- extensions/npm/src/npmMain.ts+1-6
- extensions/npm/src/tasks.ts-16
- package.json+3-3
- src/vs/platform/userDataSync/common/abstractSynchronizer.ts+1
- src/vs/platform/userDataSync/common/keybindingsMerge.ts+9-5
- src/vs/platform/userDataSync/common/keybindingsSync.ts+1-1
- src/vs/platform/userDataSync/common/userDataSync.ts+1
- src/vs/platform/userDataSync/common/userDataSyncStoreService.ts+4
- src/vs/platform/userDataSync/test/common/keybindingsSync.test.ts+64
- src/vs/workbench/common/memento.ts+10-1
- src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts+5-1
- src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts+5-5
- src/vs/workbench/contrib/webview/browser/pre/main.js+1-1
- src/vs/workbench/services/textfile/browser/textFileService.ts+6-2
- src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts+1-1
0 commit comments