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

15
node_modules/tslib/package.json generated vendored
View File

@@ -2,7 +2,11 @@
"_args": [
[
"tslib@1.11.1",
<<<<<<< HEAD
"/home/marco/repos/github/codeql-action"
=======
"/home/chris/src/github.com/github/codeql-action"
>>>>>>> origin/results-cache-test
]
],
"_development": true,
@@ -23,12 +27,23 @@
"fetchSpec": "1.11.1"
},
"_requiredBy": [
<<<<<<< HEAD
=======
"/@azure/abort-controller",
"/@azure/core-lro",
"/@azure/logger",
"/@azure/ms-rest-js",
>>>>>>> origin/results-cache-test
"/@typescript-eslint/eslint-plugin/tsutils",
"/@typescript-eslint/typescript-estree/tsutils"
],
"_resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
"_spec": "1.11.1",
<<<<<<< HEAD
"_where": "/home/marco/repos/github/codeql-action",
=======
"_where": "/home/chris/src/github.com/github/codeql-action",
>>>>>>> origin/results-cache-test
"author": {
"name": "Microsoft Corp."
},