From 54abe5231854c2d5ca96d1ef5cfe1627a56e45da Mon Sep 17 00:00:00 2001
From: Karsa <contact@karsa.org>
Date: Tue, 17 Feb 2026 09:22:57 +0100
Subject: [PATCH] fix(icons): fix linting issues in git-merge-conflict.json

---
 icons/git-merge-conflict.json | 38 +++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/icons/git-merge-conflict.json b/icons/git-merge-conflict.json
index e17653731..59614399b 100644
--- a/icons/git-merge-conflict.json
+++ b/icons/git-merge-conflict.json
@@ -1,21 +1,21 @@
 {
-    "$schema": "../icon.schema.json",
-    "contributors": [
-        "timmy471",
-        "colebemis",
-        "csandman",
-        "karsa-mistmere",
-        "ericfennis"
-    ],
-    "tags": [
-        "code",
-        "version control",
-        "commits",
-        "diff",
-        "error",
-        "conflict"
-    ],
-    "categories": [
-        "development"
-    ]
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "timmy471",
+    "colebemis",
+    "csandman",
+    "karsa-mistmere",
+    "ericfennis"
+  ],
+  "tags": [
+    "code",
+    "version control",
+    "commits",
+    "diff",
+    "error",
+    "conflict"
+  ],
+  "categories": [
+    "development"
+  ]
 }