From 4a9c38bfa3246bb6687379d7d638729959f71ecc Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 9 Dec 2016 16:05:12 +0000 Subject: [PATCH] Fix broken README merge When 546ec1a was merged into develop, I accidentally overwrote the change introduced in debbea5 (pr #1657). Reintroduce it. --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 1140f8e1b..0fb7a66ca 100644 --- a/README.rst +++ b/README.rst @@ -800,7 +800,7 @@ to install using pip and a virtualenv:: virtualenv env source env/bin/activate - python synapse/python_dependencies.py | xargs -n1 pip install + python synapse/python_dependencies.py | xargs pip install pip install setuptools_trial mock This will run a process of downloading and installing all the needed