summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Faye-Lund <erik.faye-lund@collabora.com>2022-05-31 07:17:20 +0200
committerDylan Baker <dylan.c.baker@intel.com>2022-06-01 13:18:43 -0700
commit2bbca5dc49a0c25e934e98efef39d2416994614c (patch)
tree1c24e32cd449dd5e5e3e9a6006c5c151a9bb4969
parentd69836fcaf787fdd2549b939c7fbd4a4e257cea9 (diff)
downloadmesa-2bbca5dc49a0c25e934e98efef39d2416994614c.tar.gz
editorconfig: remove html-rule
Fixes: 44a4e34d52e ("docs: remove doxygen support") Reviewed-by: Emma Anholt <emma@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16786> (cherry picked from commit 12aa3b82dcbfa7512908cd67b0832a027e39589e)
-rw-r--r--.editorconfig4
-rw-r--r--.pick_status.json2
2 files changed, 1 insertions, 5 deletions
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 d0ba4284ac4..afa96e79100 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -252,7 +252,7 @@
"description": "editorconfig: remove html-rule",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"because_sha": "44a4e34d52e68c4251afb7fb079dc9b28477195d"
},
{