summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Faye-Lund <erik.faye-lund@collabora.com>2022-05-31 07:19:27 +0200
committerDylan Baker <dylan.c.baker@intel.com>2022-06-01 13:18:43 -0700
commit74069e5abf0593926a8c3b34103484eca4f695f5 (patch)
treec2b243333b6ae747bf4c814e07aba55f3ff1a520
parent2bbca5dc49a0c25e934e98efef39d2416994614c (diff)
downloadmesa-74069e5abf0593926a8c3b34103484eca4f695f5.tar.gz
editorconfig: remove m4-rule
Fixes: 95aefc94a94 ("Delete autotools") Reviewed-by: Emma Anholt <emma@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16786> (cherry picked from commit 799bf3d6861aa688d54249646d41ce0bb2b7a86d)
-rw-r--r--.editorconfig4
-rw-r--r--.pick_status.json2
2 files changed, 1 insertions, 5 deletions
diff --git a/.editorconfig b/.editorconfig
index 5409a149d0a..3046c51156b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -24,10 +24,6 @@ indent_size = 4
indent_style = space
indent_size = 4
-[*.m4]
-indent_style = space
-indent_size = 2
-
[*.yml]
indent_style = space
indent_size = 2
diff --git a/.pick_status.json b/.pick_status.json
index afa96e79100..58af3610f25 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -244,7 +244,7 @@
"description": "editorconfig: remove m4-rule",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"because_sha": "95aefc94a941701616fda0776a3bd15710c8c151"
},
{