github/codeql-action
0
0
Fork 0
mirror of https://github.com/github/codeql-action.git synced 2026-05-07 06:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge chris

Browse Source
This commit is contained in:
Esben Sparre Andreasen
2020-12-10 11:29:11 +01:00
parent 6786d28c28 8d1985f68f
commit 766aa7fda1
8268 changed files with 935217 additions and 164291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
node_modules/json-buffer/package.json
Generated Vendored
+8
View File
@@ -2,7 +2,11 @@
"_args": [
[
"json-buffer@3.0.0",
<<<<<<< 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/json-buffer/-/json-buffer-3.0.0.tgz",
"_spec": "3.0.0",
<<<<<<< HEAD
"_where": "/home/marco/repos/github/codeql-action",
=======
"_where": "/home/chris/src/github.com/github/codeql-action",
>>>>>>> origin/results-cache-test
"author": {
"name": "Dominic Tarr",
"email": "dominic.tarr@gmail.com",