diff --git a/.gitignore b/.gitignore index e548f6174..06ba0a6cf 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ htmlcov .npm-debug.log Dockerfile-e build/ +.vscode diff --git a/README.md b/README.md index 4f0227c3a..eb2cf11ad 100644 --- a/README.md +++ b/README.md @@ -96,6 +96,7 @@ docker-machine create -d virtualbox default eval "$(pyenv virtualenv-init -)" eval "$(pyenv init -)" eval $(/usr/local/bin/docker-machine env default) +export PYTHONPATH="." # Some installs don't have /usr/include, required for finding SASL header files # This command might fail because of the rootfs is read-only. Refer to the following: @@ -214,7 +215,7 @@ that we get consistant version installs using the `yarn install` command. Howeve should be added using `yarn add `. This will add an entry to `package.json` and `yarn.lock`. Occassionally there will be merge conflicts with `yarn.lock`. To resolve them, use the following (taken -from [here](https://github.com/yarnpkg/yarn/issues/1776#issuecomment-269539948). +from [here](https://github.com/yarnpkg/yarn/issues/1776#issuecomment-269539948)). ```sh git rebase origin/master