diff --git a/.editorconfig b/.editorconfig index 4a3c7a3ae36..5409a149d0a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -32,10 +32,6 @@ indent_size = 2 indent_style = space indent_size = 2 -[*.html] -indent_style = space -indent_size = 2 - [*.rst] indent_style = space indent_size = 3 diff --git a/.pick_status.json b/.pick_status.json index 416749a97c3..5be221b222f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -283,7 +283,7 @@ "description": "editorconfig: remove html-rule", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "44a4e34d52e68c4251afb7fb079dc9b28477195d" },