-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #93 from Charlytoc/master
Update with new version of editor and cli
- Loading branch information
Showing
2 changed files
with
10 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
|
||
// For format details, see https://aka.ms/devcontainer.json. For config options, see the | ||
// README at: https://github.com/devcontainers/templates/tree/main/src/python | ||
{ | ||
|
@@ -21,7 +22,11 @@ | |
"extensions": ["learn-pack.learnpack-vscode"] | ||
} | ||
}, | ||
<<<<<<< master | ||
"onCreateCommand": "pip3 install pytest==6.2.5 mock pytest-testdox toml && npm i @learnpack/[email protected] -g && learnpack plugins:install @learnpack/[email protected]" | ||
======= | ||
"onCreateCommand": "pip3 install pytest==6.2.5 mock pytest-testdox toml && npm i @learnpack/[email protected] -g && learnpack plugins:install @learnpack/[email protected]" | ||
>>>>>>> master | ||
|
||
// Features to add to the dev container. More info: https://containers.dev/features. | ||
// "features": {}, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters