File tree Expand file tree Collapse file tree 2 files changed +0
-230
lines changed
Expand file tree Collapse file tree 2 files changed +0
-230
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff 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
212201export const tsFormattingFilter = Object . freeze < string [ ] > ( [
213202 'src/**/*.ts' ,
You can’t perform that action at this time.
0 commit comments