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:
15
node_modules/tslib/package.json
generated
vendored
15
node_modules/tslib/package.json
generated
vendored
@@ -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."
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user