aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStevan Radaković <stevan.radakovic@linaro.org>2013-03-31 22:54:19 +0200
committerStevan Radaković <stevan.radakovic@linaro.org>2013-03-31 22:54:19 +0200
commit7b7f978c6208ea95cad15c5ad6beafa54768de01 (patch)
tree3dfe4643732bde0770d22585f67d4e77a00ef940
parentdc686c266ea367ddc02c53604a1eaf6c7f11be50 (diff)
Fix lines removed by auto-merge take three.
-rw-r--r--setup.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/setup.py b/setup.py
index 60dd018f..3e485540 100644
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,7 @@ if sys.version_info < (2, 7):
if is_windows:
requirements.append("mercurial==2.4.2")
else:
+ requirements.append("py-bcrypt")
requirements.append("mercurial==2.4.2")