mirror of
https://github.com/github/codeql-action.git
synced 2026-05-06 22:00:39 +00:00
merge chris
This commit is contained in:
+8
@@ -2,7 +2,11 @@
|
||||
"_args": [
|
||||
[
|
||||
"array.prototype.flat@1.2.3",
|
||||
<<<<<<< HEAD
|
||||
"/home/marco/repos/github/codeql-action"
|
||||
=======
|
||||
"/home/chris/src/github.com/github/codeql-action"
|
||||
>>>>>>> origin/results-cache-test
|
||||
]
|
||||
],
|
||||
"_development": true,
|
||||
@@ -27,7 +31,11 @@
|
||||
],
|
||||
"_resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
|
||||
"_spec": "1.2.3",
|
||||
<<<<<<< HEAD
|
||||
"_where": "/home/marco/repos/github/codeql-action",
|
||||
=======
|
||||
"_where": "/home/chris/src/github.com/github/codeql-action",
|
||||
>>>>>>> origin/results-cache-test
|
||||
"author": {
|
||||
"name": "Jordan Harband",
|
||||
"email": "ljharb@gmail.com",
|
||||
|
||||
Reference in New Issue
Block a user