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

View File

@@ -2,7 +2,11 @@
"_args": [
[
"rimraf@2.6.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/rimraf/-/rimraf-2.6.3.tgz",
"_spec": "2.6.3",
<<<<<<< HEAD
"_where": "/home/marco/repos/github/codeql-action",
=======
"_where": "/home/chris/src/github.com/github/codeql-action",
>>>>>>> origin/results-cache-test
"author": {
"name": "Isaac Z. Schlueter",
"email": "i@izs.me",

View File

@@ -2,7 +2,11 @@
"_args": [
[
"flat-cache@2.0.1",
<<<<<<< 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/flat-cache/-/flat-cache-2.0.1.tgz",
"_spec": "2.0.1",
<<<<<<< HEAD
"_where": "/home/marco/repos/github/codeql-action",
=======
"_where": "/home/chris/src/github.com/github/codeql-action",
>>>>>>> origin/results-cache-test
"author": {
"name": "Roy Riojas",
"url": "http://royriojas.com"