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

13
node_modules/node-fetch/package.json generated vendored
View File

@@ -2,7 +2,11 @@
"_args": [
[
"node-fetch@2.6.1",
<<<<<<< HEAD
"/home/marco/repos/github/codeql-action"
=======
"/home/chris/src/github.com/github/codeql-action"
>>>>>>> origin/results-cache-test
]
],
"_from": "node-fetch@2.6.1",
@@ -22,11 +26,20 @@
"fetchSpec": "2.6.1"
},
"_requiredBy": [
<<<<<<< HEAD
=======
"/@azure/core-http",
"/@azure/ms-rest-js",
>>>>>>> origin/results-cache-test
"/@octokit/request"
],
"_resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
"_spec": "2.6.1",
<<<<<<< HEAD
"_where": "/home/marco/repos/github/codeql-action",
=======
"_where": "/home/chris/src/github.com/github/codeql-action",
>>>>>>> origin/results-cache-test
"author": {
"name": "David Frank"
},