diff options
| author | John Peter Yamauchi <johnpeteryams@gmail.com> | 2019-02-19 22:06:07 -0600 |
|---|---|---|
| committer | John Peter Yamauchi <johnpeteryams@gmail.com> | 2019-02-19 22:06:07 -0600 |
| commit | 2571835f4c2cd2ab96f2b71271f3e93b56611e46 (patch) | |
| tree | 044e7dbfe2d1e453363366a5aac0318cacf49f84 | |
| parent | 821cf166606e82cc971f925ab7e104d76c8e1a3b (diff) | |
| download | screenplain-2571835f4c2cd2ab96f2b71271f3e93b56611e46.tar.gz | |
Fixed merge issue
| -rw-r--r-- | README.markdown | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/README.markdown b/README.markdown index db5a2f5..445ad1c 100644 --- a/README.markdown +++ b/README.markdown @@ -69,13 +69,6 @@ Set up environment using virtualenvwrapper: mkvirtualenv --no-site-packages screenplain pip install -r requirements.txt -<<<<<<< HEAD - -For developing for Python 3, instead use: - - mkvirtualenv --no-site-packages --python=$(which python3) screenplain-py3 - pip install -r requirements-py3.txt -======= pip install -e . After this, the `screenplain` command will use the working copy of your code. @@ -83,4 +76,7 @@ After this, the `screenplain` command will use the working copy of your code. To run unit tests and style checks, run: bin/test ->>>>>>> master + +For developing for Python 3, instead use: + + mkvirtualenv --no-site-packages --python=$(which python3) screenplain-py3 |