Skip to content

Commit 1438aac

Browse files
authored
Merge pull request #21830 from mguetschow/editorconfig
.editorconfig, .vscode: fix typo and support user-settings
2 parents 49b01c4 + 4eb34e4 commit 1438aac

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ insert_final_newline = true
1111
[{Makefile*,*.mk}]
1212
indent_style = tab
1313
indent_size = 2
14-
tab_size = 2
1514
trim_trailing_whitespace = true
1615
insert_final_newline = true
1716

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ cachegrind.out*
3939
# Visual Studio Code user settings
4040
.vscode/*
4141
!.vscode/settings.json
42+
*.code-workspace
4243
# ctags index files
4344
tags
4445
# GDB initialization scripts

0 commit comments

Comments
 (0)