mirror of
https://github.com/github/codeql-action.git
synced 2026-11-05 04:29:40 +00:00
merge chris
This commit is contained in:
8
node_modules/flat-cache/node_modules/rimraf/package.json
generated
vendored
8
node_modules/flat-cache/node_modules/rimraf/package.json
generated
vendored
@@ -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",
|
||||
|
||||
8
node_modules/flat-cache/package.json
generated
vendored
8
node_modules/flat-cache/package.json
generated
vendored
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user