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" + ] }