Skip to content

Commit

Permalink
Merge branch 'master' into catkinArgs
Browse files Browse the repository at this point in the history
  • Loading branch information
anton-matosov authored Oct 3, 2020
2 parents 42ea405 + 5889eb9 commit 5d75759
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 21 deletions.
30 changes: 11 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -340,13 +340,13 @@
"shell-quote": "^1.7.2",
"sudo-prompt": "^9.2.1",
"tmp": "^0.2.1",
"vscode-debugadapter": "^1.41.1",
"vscode-debugadapter": "^1.42.1",
"vscode-extension-telemetry": "^0.1.6",
"xmlrpc": "^1.3.2"
},
"devDependencies": {
"@types/js-yaml": "^3.12.5",
"@types/node": "^14.11.1",
"@types/node": "^14.11.2",
"@types/shell-quote": "^1.7.0",
"@types/tmp": "^0.2.0",
"@types/xmlrpc": "^1.3.6",
Expand Down

0 comments on commit 5d75759

Please sign in to comment.