diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-08-26 11:13:58 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-08-26 11:13:58 -0300 |
commit | 525ff6730d45fc0d08db808c577b8753803798fc (patch) | |
tree | a46142b663bb50ae4a879bd90e07ddb52e38412f /common/pkg/requirements.pip | |
parent | a10924b0e2cf19feb673f23ff34707a663001335 (diff) | |
parent | 0ac91baec282c1ca32a2f736e971393103cab0c4 (diff) |
Merge remote-tracking branch 'kali/hotfix/remove-six-hard-dep' into develop
Diffstat (limited to 'common/pkg/requirements.pip')
-rw-r--r-- | common/pkg/requirements.pip | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/common/pkg/requirements.pip b/common/pkg/requirements.pip index 8fd57c3f..5787114e 100644 --- a/common/pkg/requirements.pip +++ b/common/pkg/requirements.pip @@ -1,6 +1,5 @@ simplejson u1db -six==1.1.0 # some tests are incompatible with newer versions of six. #this is not strictly needed by us, but we need it #until u1db adds it to its release as a dep. |