merge chris

This commit is contained in:
Esben Sparre Andreasen
2020-12-10 11:29:11 +01:00
8268 changed files with 935217 additions and 164291 deletions
+8
View File
@@ -2,7 +2,11 @@
"_args": [
[
"get-stream@5.1.0",
<<<<<<< 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/get-stream/-/get-stream-5.1.0.tgz",
"_spec": "5.1.0",
<<<<<<< HEAD
"_where": "/home/marco/repos/github/codeql-action",
=======
"_where": "/home/chris/src/github.com/github/codeql-action",
>>>>>>> origin/results-cache-test
"author": {
"name": "Sindre Sorhus",
"email": "sindresorhus@gmail.com",
@@ -2,7 +2,11 @@
"_args": [
[
"lowercase-keys@2.0.0",
<<<<<<< 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/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
"_spec": "2.0.0",
<<<<<<< HEAD
"_where": "/home/marco/repos/github/codeql-action",
=======
"_where": "/home/chris/src/github.com/github/codeql-action",
>>>>>>> origin/results-cache-test
"author": {
"name": "Sindre Sorhus",
"email": "sindresorhus@gmail.com",
+8
View File
@@ -2,7 +2,11 @@
"_args": [
[
"cacheable-request@6.1.0",
<<<<<<< HEAD
"/home/marco/repos/github/codeql-action"
=======
"/home/chris/src/github.com/github/codeql-action"
>>>>>>> origin/results-cache-test
]
],
"_development": true,
@@ -29,7 +33,11 @@
],
"_resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
"_spec": "6.1.0",
<<<<<<< HEAD
"_where": "/home/marco/repos/github/codeql-action",
=======
"_where": "/home/chris/src/github.com/github/codeql-action",
>>>>>>> origin/results-cache-test
"author": {
"name": "Luke Childs",
"email": "lukechilds123@gmail.com",