Merge pull request #2551 from github/nora/fix-merge-conflict-mistake

norascheuch · web-flow · commit 2a332f90c4fc · 2023-06-27T10:46:00.000+02:00
Fix merge conflict error: Re-add icon
diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json
@@ -503,7 +503,8 @@
       },
       {
         "command": "codeQLQueries.runLocalQueryFromQueriesPanel",
-        "title": "Run local query"
+        "title": "Run local query",
+        "icon": "$(run)"
       },
       {
         "command": "codeQL.runLocalQueryFromFileTab",

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,8 @@`
`503`	`503`	`},`
`504`	`504`	`{`
`505`	`505`	`"command": "codeQLQueries.runLocalQueryFromQueriesPanel",`
`506`		`- "title": "Run local query"`
	`506`	`+ "title": "Run local query",`
	`507`	`+ "icon": "$(run)"`
`507`	`508`	`},`
`508`	`509`	`{`
`509`	`510`	`"command": "codeQL.runLocalQueryFromFileTab",`