diff --git a/.editorconfig b/.editorconfig index a9c55b7b234..4a3c7a3ae36 100644 --- a/.editorconfig +++ b/.editorconfig @@ -16,7 +16,7 @@ max_line_length = 78 [{Makefile*,*.mk}] indent_style = tab -[{*.py,SCons*}] +[*.py] indent_style = space indent_size = 4 diff --git a/.pick_status.json b/.pick_status.json index 566f5d25e6a..d0ba4284ac4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -260,7 +260,7 @@ "description": "editorconfig: remove scons-ism", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "because_sha": "6e6cd7d93cc54fc8c279377c2d552761f4457174" }, {