Mesa (staging/22.0): editorconfig: remove m4-rule

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 74069e5abf0593926a8c3b34103484eca4f695f5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=74069e5abf0593926a8c3b34103484eca4f695f5

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Tue May 31 07:19:27 2022 +0200

editorconfig: remove m4-rule

Fixes: 95aefc94a94 ("Delete autotools")
Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16786>
(cherry picked from commit 799bf3d6861aa688d54249646d41ce0bb2b7a86d)

---

 .editorconfig     | 4 ----
 .pick_status.json | 2 +-
 2 files changed, 1 insertion(+), 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"
     },
     {