Skip to content

Commit 6459db0

Browse files
author
Tajudeen
committed
Fix remaining merge conflict in build/filters.ts
1 parent 6a07da9 commit 6459db0

File tree

2 files changed

+0
-230
lines changed

2 files changed

+0
-230
lines changed

VSCODE_SYNC_STRATEGY.md

Lines changed: 0 additions & 219 deletions
This file was deleted.

build/filters.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,7 @@ export const indentationFilter = Object.freeze<string[]>([
110110
'!build/win32/**',
111111
'!build/checker/**',
112112
'!src/vs/workbench/contrib/terminal/common/scripts/psreadline/**',
113-
<<<<<<< Updated upstream
114-
=======
115113
'!src/vs/workbench/contrib/cortexide/**',
116-
>>>>>>> Stashed changes
117114

118115
// except multiple specific files
119116
'!**/package.json',
@@ -198,16 +195,8 @@ export const copyrightFilter = Object.freeze<string[]>([
198195
'!extensions/html-language-features/server/src/modes/typescript/*',
199196
'!extensions/*/server/bin/*',
200197
'!src/vs/workbench/contrib/terminal/common/scripts/psreadline/**',
201-
<<<<<<< Updated upstream
202-
]);
203-
=======
204-
<<<<<<< HEAD:build/filters.js
205198
'!src/vs/workbench/contrib/cortexide/**',
206-
];
207-
=======
208199
]);
209-
>>>>>>> vscode/main:build/filters.ts
210-
>>>>>>> Stashed changes
211200

212201
export const tsFormattingFilter = Object.freeze<string[]>([
213202
'src/**/*.ts',

0 commit comments

Comments
 (0)