eae5d8c807
These conflicts will be resolved in the following commits. We do it this way so that PR review is possible. |
||
|---|---|---|
| .. | ||
| code-import-patterns.js | ||
| code-import-patterns.ts | ||
| code-layering.js | ||
| code-layering.ts | ||
| code-no-nls-in-standalone-editor.js | ||
| code-no-nls-in-standalone-editor.ts | ||
| code-no-standalone-editor.js | ||
| code-no-standalone-editor.ts | ||
| code-no-unexternalized-strings.js | ||
| code-no-unexternalized-strings.ts | ||
| code-no-unused-expressions.js | ||
| code-no-unused-expressions.ts | ||
| code-translation-remind.js | ||
| code-translation-remind.ts | ||
| utils.js | ||
| utils.ts | ||
| vscode-dts-cancellation.js | ||
| vscode-dts-cancellation.ts | ||
| vscode-dts-create-func.js | ||
| vscode-dts-create-func.ts | ||
| vscode-dts-event-naming.js | ||
| vscode-dts-event-naming.ts | ||
| vscode-dts-interface-naming.js | ||
| vscode-dts-interface-naming.ts | ||
| vscode-dts-literal-or-types.js | ||
| vscode-dts-literal-or-types.ts | ||
| vscode-dts-provider-naming.js | ||
| vscode-dts-provider-naming.ts | ||
| vscode-dts-region-comments.js | ||
| vscode-dts-region-comments.ts | ||
| vscode-dts-use-thenable.js | ||
| vscode-dts-use-thenable.ts | ||